X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=examples%2Fredhat%2Fsamba-make.patch;h=f1c6a733e9ea98d4e6df31383d9e0843ad91144b;hp=c34990f62c585f0121a3238fbd3076eb7278ecfb;hb=7c723f75fd10f6c13d5404eddd29b55a07c4a594;hpb=ec696ace9abd2ccd242d8fc84771595ebd1340cf diff --git a/examples/redhat/samba-make.patch b/examples/redhat/samba-make.patch index c34990f62c5..f1c6a733e9e 100644 --- a/examples/redhat/samba-make.patch +++ b/examples/redhat/samba-make.patch @@ -1,7 +1,11 @@ -*** samba-1.9.16p9/source/Makefile.orig Thu Jan 2 15:46:46 1997 ---- samba-1.9.16p9/source/Makefile Thu Jan 2 15:59:09 1997 +*** samba-1.9.17/source/Makefile.orig Sat Jul 12 12:51:39 1997 +--- samba-1.9.17/source/Makefile Sat Jul 12 12:56:04 1997 *************** -*** 5,20 **** +*** 5,15 **** + ########################################################################### + + # The base directory for all samba files +! BASEDIR = /usr/local/samba # The base manpages directory to put the man pages in # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. @@ -9,40 +13,41 @@ # The directories to put things in. If you use multiple # architectures or share the samba binaries across NFS then - # you will probably want to change this layout. -! BASEDIR = /usr/local/samba -! BINDIR = $(BASEDIR)/bin -! SBINDIR = $(BASEDIR)/bin -! LIBDIR = $(BASEDIR)/lib -! VARDIR = $(BASEDIR)/var +--- 5,15 ---- + ########################################################################### - # The permissions to give the executables - INSTALLPERMS = 0755 ---- 5,20 ---- + # The base directory for all samba files +! BASEDIR = /usr # The base manpages directory to put the man pages in # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist. -! MANDIR = /usr/man +! MANDIR = $(BASEDIR)/man # The directories to put things in. If you use multiple # architectures or share the samba binaries across NFS then - # you will probably want to change this layout. -! BASEDIR = / -! BINDIR = $(BASEDIR)usr/bin -! SBINDIR = $(BASEDIR)usr/sbin +*************** +*** 18,26 **** + # normally only applies to nmbd and smbd + # SBINDIR implies a secure binary directory + BINDIR = $(BASEDIR)/bin +! SBINDIR = $(BASEDIR)/bin +! LIBDIR = $(BASEDIR)/lib +! VARDIR = $(BASEDIR)/var + + # The permissions to give the executables + INSTALLPERMS = 0755 +--- 18,26 ---- + # normally only applies to nmbd and smbd + # SBINDIR implies a secure binary directory + BINDIR = $(BASEDIR)/bin +! SBINDIR = $(BASEDIR)/sbin ! LIBDIR = /etc ! VARDIR = /var # The permissions to give the executables INSTALLPERMS = 0755 *************** -*** 23,35 **** - # add -DSYSLOG for syslog support - # RPM_OPT_FLAGS is needed when building an RPM distribution package - # for RedHat Linux. -! # FLAGS1 = $(RPM_OPT_FLAGS) - FLAGS1 = -O - LIBS1 = +*** 35,41 **** # You will need to use a ANSI C compiler. This means under SunOS 4 you can't # use cc, instead you will have to use gcc. @@ -50,13 +55,7 @@ # This may help with some versions of make SHELL = /bin/sh ---- 23,35 ---- - # add -DSYSLOG for syslog support - # RPM_OPT_FLAGS is needed when building an RPM distribution package - # for RedHat Linux. -! FLAGS1 = $(RPM_OPT_FLAGS) - FLAGS1 = -O - LIBS1 = +--- 35,41 ---- # You will need to use a ANSI C compiler. This means under SunOS 4 you can't # use cc, instead you will have to use gcc. @@ -65,7 +64,7 @@ # This may help with some versions of make SHELL = /bin/sh *************** -*** 42,54 **** +*** 48,60 **** # 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)) @@ -79,12 +78,12 @@ # set this to the default group you want your machine to appear in # for browsing. This can also be set in nmbd (see nmbd(8)) ---- 42,54 ---- +--- 48,60 ---- # 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)) -! SMBLOGFILE = $(VARDIR)/log/log.smb -! NMBLOGFILE = $(VARDIR)/log/log.nmb +! SMBLOGFILE = $(VARDIR)/log/samba/log.smb +! NMBLOGFILE = $(VARDIR)/log/samba/log.nmb CONFIGFILE = $(LIBDIR)/smb.conf LMHOSTSFILE = $(LIBDIR)/lmhosts @@ -94,41 +93,39 @@ # set this to the default group you want your machine to appear in # for browsing. This can also be set in nmbd (see nmbd(8)) *************** -*** 71,78 **** +*** 77,84 **** # This is for PAM authentication. RedHat Linux uses PAM. # If you use PAM, then uncomment the following lines: -! # PAM_FLAGS = -DUSE_PAM -DNO_CRYPT +! # PAM_FLAGS = -DUSE_PAM ! # PAM_LIBS = -ldl -lpam # This is for AFS authentication. If you use AFS then set AFS_BASE # according to your system layout, and uncomment the other lines as well. ---- 71,78 ---- +--- 77,84 ---- # This is for PAM authentication. RedHat Linux uses PAM. # If you use PAM, then uncomment the following lines: -! PAM_FLAGS = -DUSE_PAM -DNO_CRYPT +! PAM_FLAGS = -DUSE_PAM ! PAM_LIBS = -ldl -lpam # This is for AFS authentication. If you use AFS then set AFS_BASE # according to your system layout, and uncomment the other lines as well. *************** -*** 178,185 **** - - # Use this for Linux without shadow passwords +*** 187,194 **** # contributed by Andrew.Tridgell@anu.edu.au -! # FLAGSM = -DLINUX + # AXPROC defines DEC Alpha Processor + # FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES +! # FLAGSM = -DLINUX -DFAST_SHARE_MODES ! # LIBSM = # Use this for Linux with shadow passwords and quota # contributed by xeno@mix.hive.no ---- 178,187 ---- - - # Use this for Linux without shadow passwords +--- 187,194 ---- # contributed by Andrew.Tridgell@anu.edu.au -! # AXPROC defines DEC Alpha Processor -! # FLAGSM = -DLINUX -DAXPROC -! FLAGSM = -DLINUX + # AXPROC defines DEC Alpha Processor + # FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES +! FLAGSM = -DLINUX -DFAST_SHARE_MODES ! LIBSM = # Use this for Linux with shadow passwords and quota