diff options
| author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2001-12-16 19:20:38 +0000 |
|---|---|---|
| committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2001-12-16 19:20:38 +0000 |
| commit | 0b5f271992ab768b2efe599808cd5cfa4edfd8c6 (patch) | |
| tree | 6f476d947d34ba325b14a4ea89a7735086d29dbf /net/samba-devel/files/patch-aa | |
| parent | Fix typo in pkg-message (diff) | |
Update to 3.0 alpha 8
Notes
Notes:
svn path=/head/; revision=51633
Diffstat (limited to 'net/samba-devel/files/patch-aa')
| -rw-r--r-- | net/samba-devel/files/patch-aa | 61 |
1 files changed, 37 insertions, 24 deletions
diff --git a/net/samba-devel/files/patch-aa b/net/samba-devel/files/patch-aa index b0024a08bcfa..f39f5615be26 100644 --- a/net/samba-devel/files/patch-aa +++ b/net/samba-devel/files/patch-aa @@ -1,35 +1,48 @@ ---- Makefile.in.orig Sat Oct 13 22:09:06 2001 -+++ Makefile.in Tue Oct 16 17:15:15 2001 -@@ -46,11 +46,11 @@ +--- Makefile.in.orig Thu Dec 13 21:38:49 2001 ++++ Makefile.in Sun Dec 16 13:09:45 2001 +@@ -50,7 +50,7 @@ # set these to where to find various files # These can be overridden by command line switches (see smbd(8)) # or in smb.conf (see smb.conf(5)) --LOGFILEBASE = @logfilebase@ +-LOGFILEBASE = $(VARDIR) +LOGFILEBASE = $(VARDIR)/log - CONFIGFILE = $(CONFIGDIR)/smb.conf - LMHOSTSFILE = $(CONFIGDIR)/lmhosts - DRIVERFILE = $(CONFIGDIR)/printers.def --PASSWD_PROGRAM = /bin/passwd -+PASSWD_PROGRAM = /usr/bin/passwd - # This is where smbpasswd et al go - PRIVATEDIR = @privatedir@ - -@@ -63,6 +63,9 @@ + CONFIGFILE = $(LIBDIR)/smb.conf + LMHOSTSFILE = $(LIBDIR)/lmhosts + DRIVERFILE = $(LIBDIR)/printers.def +@@ -66,6 +66,9 @@ # the directory where lock files go LOCKDIR = @lockdir@ +# the directory where pid files go +PIDFILEDIR = $(VARDIR)/run + - # libsmbclient support here - BLDSHARED = @BLDSHARED@ - LIBSMBCLIENT_MAJOR=0 + # man pages language(s) + man_langs = "@manlangs@" + @@ -78,7 +81,7 @@ - PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\" - FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\" - FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" --FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" - FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" - FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H - FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) + FLAGS32 = $(ISA32) $(FLAGS5) + + PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\" +-PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" ++PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" + PATH_FLAGS2 = $(PATH_FLAGS1) -DBINDIR=\"$(BINDIR)\" -DDRIVERFILE=\"$(DRIVERFILE)\" + PATH_FLAGS3 = $(PATH_FLAGS2) -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" + PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" +@@ -503,7 +506,7 @@ + @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ + dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi + @echo Compiling $*.c +- @$(CC) -I. -I$(srcdir) $(FLAGS) -c $< \ ++ @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) -c $< \ + -o $@ + @BROKEN_CC@ -mv `echo $@ | sed 's%^.*/%%g'` $@ + +@@ -529,7 +532,7 @@ + @if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \ + dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi + @echo Compiling $*.c with @PICFLAG@ +- @$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< -o $*.@PICSUFFIX@ ++ @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAG@ -c $< -o $*.@PICSUFFIX@ + @BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@ + @POBAD_CC@ @mv $*.po.o $@ + |