--- Makefile.orig	Mon May 11 03:37:44 1998
+++ Makefile	Thu May 28 18:14:02 1998
@@ -5,11 +5,11 @@
 ###########################################################################
 
 # The base directory for all samba files
-BASEDIR = /usr/local/samba
+BASEDIR = /usr
 
 # The base manpages directory to put the man pages in
 # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
-MANDIR = /usr/local/man
+MANDIR = /usr/man
 
 # The directories to put things in. If you use multiple
 # architectures or share the samba binaries across NFS then
@@ -17,10 +17,10 @@
 # Note: The SBINDIR is for files you do not want users to access
 #       normally only applies to nmbd and smbd
 #       SBINDIR implies a secure binary directory
-BINDIR = $(BASEDIR)/bin
-SBINDIR = $(BASEDIR)/bin
+BINDIR = $(BASEDIR)/sbin
+SBINDIR = $(BASEDIR)/sbin
 LIBDIR = $(BASEDIR)/lib
-VARDIR = $(BASEDIR)/var
+VARDIR = /var/log
 
 # The permissions to give the executables
 INSTALLPERMS = 0755
@@ -47,15 +47,15 @@
 # or in smb.conf (see smb.conf(5))
 SMBLOGFILE = $(VARDIR)/log.smb
 NMBLOGFILE = $(VARDIR)/log.nmb
-CONFIGFILE = $(LIBDIR)/smb.conf
-LMHOSTSFILE = $(LIBDIR)/lmhosts
+CONFIGFILE = /etc/smb.conf
+LMHOSTSFILE = /etc/lmhosts
 DRIVERFILE = $(LIBDIR)/printers.def
 SMB_PASSWD = $(BINDIR)/smbpasswd
 SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
 WEB_ROOT = $(BASEDIR)
 
 # the directory where lock files go
-LOCKDIR = $(VARDIR)/locks
+LOCKDIR = $(VARDIR)/lock
 
 # The directory where code page definition files go
 CODEPAGEDIR = $(LIBDIR)/codepages
@@ -77,7 +77,7 @@
 # where you are going to have the smbrun binary. This defaults to the 
 # install directory. This binary is needed for correct printing
 # and magic script execution. This should be an absolute path!
-# Also not that this should include the name "smbrun" on the end (the
+# Also note that this should include the name "smbrun" on the end (the
 # name of the executable)
 SMBRUN = $(BINDIR)/smbrun
 
@@ -206,8 +206,8 @@
 # contributed by Andrew.Tridgell@anu.edu.au
 # add -DLINUX_BIGCRYPT is you have shadow passwords but don't have the
 # right libraries and includes
-# FLAGSM = -DLINUX -DSHADOW_PWD -DFAST_SHARE_MODES
-# LIBSM = -lshadow
+FLAGSM = -DLINUX -DSHADOW_PWD -DFAST_SHARE_MODES -Dcrypt=pw_encrypt
+LIBSM = -lshadow
 
 # Use this for Linux without shadow passwords or for any Linux
 # system that uses PAM (eg: RedHat) in which case it handles ALL