--- Makefile.in.orig	Sat Mar  6 02:25:16 1999
+++ Makefile.in	Sat Mar  6 02:44:42 1999
@@ -25,7 +25,9 @@
 BINDIR = @bindir@
 # we don't use sbindir because we want full compatibility with
 # the previous releases of Samba
-SBINDIR = @bindir@
+#SBINDIR = @bindir@
+# previous releases of the OpenBSD port did use sbindir
+SBINDIR = @sbindir@
 LIBDIR = @libdir@
 VARDIR = @localstatedir@
 MANDIR = @mandir@
@@ -36,16 +38,16 @@
 # 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
+SMBLOGFILE = $(VARDIR)/log/smbd
+NMBLOGFILE = $(VARDIR)/log/nmbd
+
 # This is where smbpasswd et al go
 PRIVATEDIR = @privatedir@
-
 SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd
+CONFIGFILE = $(PRIVATEDIR)/smb.conf
+LMHOSTSFILE = $(PRIVATEDIR)/lmhosts
+DRIVERFILE = $(PRIVATEDIR)/printers.def
+PASSWD_PROGRAM = /usr/bin/passwd
 
 # This is where SWAT images and help files go
 SWATDIR = @swatdir@