*** Makefile.in.orig	Tue Dec 15 10:39:05 1998
--- Makefile.in	Tue Dec 15 10:59:14 1998
***************
*** 21,34 ****
  builddir=@builddir@
  SHELL=/bin/sh
  
! BASEDIR= @prefix@
! BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
! SBINDIR = @bindir@
! LIBDIR = @libdir@
! VARDIR = @localstatedir@
! MANDIR = @mandir@
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
--- 21,34 ----
  builddir=@builddir@
  SHELL=/bin/sh
  
! BASEDIR=/usr
! BINDIR = $(BASEDIR)/bin
  # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
! SBINDIR = $(BASEDIR)/sbin
! LIBDIR = /etc
! VARDIR = /var
! MANDIR = $(BASEDIR)/man
  
  # The permissions to give the executables
  INSTALLPERMS = 0755
***************
*** 36,49 ****
  # 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.smb
! NMBLOGFILE = $(VARDIR)/log.nmb
  CONFIGFILE = $(LIBDIR)/smb.conf
  LMHOSTSFILE = $(LIBDIR)/lmhosts
  DRIVERFILE = $(LIBDIR)/printers.def
  PASSWD_PROGRAM = /bin/passwd
  # This is where smbpasswd et al go
! PRIVATEDIR = @privatedir@
  
  SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
  SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
--- 36,49 ----
  # 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/samba/log.smb
! NMBLOGFILE = $(VARDIR)/log/samba/log.nmb
  CONFIGFILE = $(LIBDIR)/smb.conf
  LMHOSTSFILE = $(LIBDIR)/lmhosts
  DRIVERFILE = $(LIBDIR)/printers.def
  PASSWD_PROGRAM = /bin/passwd
  # This is where smbpasswd et al go
! PRIVATEDIR = $(LIBDIR)
  
  SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
  SMB_PASSGRP_FILE = $(PRIVATEDIR)/smbpassgrp
***************
*** 52,58 ****
  SWATDIR = @swatdir@
  
  # the directory where lock files go
! LOCKDIR = $(VARDIR)/locks
  
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
--- 52,58 ----
  SWATDIR = @swatdir@
  
  # the directory where lock files go
! LOCKDIR = $(VARDIR)/lock/samba
  
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages