diff options
Diffstat (limited to 'net/samba-devel/files/patch-aa')
| -rw-r--r-- | net/samba-devel/files/patch-aa | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/net/samba-devel/files/patch-aa b/net/samba-devel/files/patch-aa index 6ba160fb1b10..25b34dc94d86 100644 --- a/net/samba-devel/files/patch-aa +++ b/net/samba-devel/files/patch-aa @@ -1,32 +1,20 @@ ---- Makefile.in.orig Mon Jan 29 19:42:53 2001 -+++ Makefile.in Fri Feb 2 10:42:21 2001 -@@ -30,9 +30,9 @@ - BINDIR = @bindir@ - # we don't use sbindir because we want full compatibility with - # the previous releases of Samba --SBINDIR = @bindir@ -+SBINDIR = @sbindir@ - LIBDIR = @libdir@ --VARDIR = @localstatedir@ -+VARDIR = /var - MANDIR = @mandir@ - - # The permissions to give the executables -@@ -41,11 +41,11 @@ +--- Makefile.in.orig Fri Mar 23 16:38:06 2001 ++++ Makefile.in Fri Mar 23 18:12:53 2001 +@@ -43,11 +43,11 @@ # 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 = $(VARDIR) +-LOGFILEBASE = @logfilebase@ +LOGFILEBASE = $(VARDIR)/log - CONFIGFILE = $(LIBDIR)/smb.conf - LMHOSTSFILE = $(LIBDIR)/lmhosts - DRIVERFILE = $(LIBDIR)/printers.def + 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@ -@@ -58,6 +58,9 @@ +@@ -60,6 +60,9 @@ # the directory where lock files go LOCKDIR = @lockdir@ @@ -34,14 +22,14 @@ +PIDFILEDIR = $(VARDIR)/run + # The directory where code page definition files go - CODEPAGEDIR = $(LIBDIR)/codepages + CODEPAGEDIR = @codepagedir@ -@@ -75,7 +78,7 @@ +@@ -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)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" +FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" - FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\" + FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) |