preparing for release of 1.9.18p3
[Samba.git] / packaging / Caldera / samba-make.patch
blob205262348b4389032f97e2b70549e7ed6d728c7a
1 --- samba-1.9.18p3/source/Makefile.orig Wed Feb 18 10:18:43 1998
2 +++ samba-1.9.18p3/source/Makefile Thu Feb 19 06:43:17 1998
3 @@ -5,11 +5,11 @@
4 ###########################################################################
6 # The base directory for all samba files
7 -BASEDIR = /usr/local/samba
8 +BASEDIR = /usr
10 # The base manpages directory to put the man pages in
11 # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
12 -MANDIR = /usr/local/man
13 +MANDIR = /usr/man
15 # The directories to put things in. If you use multiple
16 # architectures or share the samba binaries across NFS then
17 @@ -18,9 +18,9 @@
18 # normally only applies to nmbd and smbd
19 # SBINDIR implies a secure binary directory
20 BINDIR = $(BASEDIR)/bin
21 -SBINDIR = $(BASEDIR)/bin
22 -LIBDIR = $(BASEDIR)/lib
23 -VARDIR = $(BASEDIR)/var
24 +SBINDIR = $(BASEDIR)/sbin
25 +LIBDIR = /etc
26 +VARDIR = /var
28 # The permissions to give the executables
29 INSTALLPERMS = 0755
30 @@ -32,7 +32,7 @@
32 # You will need to use a ANSI C compiler. This means under SunOS 4 you can't
33 # use cc, instead you will have to use gcc.
34 -# CC = gcc
35 +CC = gcc
37 # This may help with some versions of make
38 SHELL = /bin/sh
39 @@ -45,17 +45,17 @@
40 # set these to where to find various files
41 # These can be overridden by command line switches (see smbd(8))
42 # or in smb.conf (see smb.conf(5))
43 -SMBLOGFILE = $(VARDIR)/log.smb
44 -NMBLOGFILE = $(VARDIR)/log.nmb
45 +SMBLOGFILE = $(VARDIR)/log/samba/log.smb
46 +NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
47 CONFIGFILE = $(LIBDIR)/smb.conf
48 LMHOSTSFILE = $(LIBDIR)/lmhosts
49 DRIVERFILE = $(LIBDIR)/printers.def
50 SMB_PASSWD = $(BINDIR)/smbpasswd
51 -SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
52 +SMB_PASSWD_FILE = /etc/smbpasswd
53 WEB_ROOT = $(BASEDIR)
55 # the directory where lock files go
56 -LOCKDIR = $(VARDIR)/locks
57 +LOCKDIR = $(VARDIR)/lock/samba
59 # The directory where code page definition files go
60 CODEPAGEDIR = $(LIBDIR)/codepages
61 @@ -90,8 +90,8 @@
63 # This is for PAM authentication. RedHat Linux uses PAM.
64 # If you use PAM, then uncomment the following lines:
65 -# PAM_FLAGS = -DUSE_PAM
66 -# PAM_LIBS = -ldl -lpam
67 +PAM_FLAGS = -DUSE_PAM
68 +PAM_LIBS = -ldl -lpam
70 # This is for AFS authentication. If you use AFS then set AFS_BASE
71 # according to your system layout, and uncomment the other lines as well.
72 @@ -209,8 +209,8 @@
73 # contributed by Andrew.Tridgell@anu.edu.au & John.Terpstra@aquasoft.com.au
74 # AXPROC defines DEC Alpha Processor
75 # FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
76 -# FLAGSM = -DLINUX -DFAST_SHARE_MODES
77 -# LIBSM =
78 +FLAGSM = -DLINUX -DFAST_SHARE_MODES
79 +LIBSM =
81 # Use this for Linux with shadow passwords and quota - but not using PAM!
82 # contributed by xeno@mix.hive.no