the only change to config.in is an additional space to
make things clearer (note: CONFIGFILE in there still works and is
relevant)
Index: source/Makefile.in
===================================================================
RCS file: /cvsroot/samba/source/Makefile.in,v
retrieving revision 1.501
diff -u -r1.501 Makefile.in
--- source/Makefile.in 29 Jul 2002 09:26:38 -0000 1.501
+++ source/Makefile.in 29 Jul 2002 16:00:53 -0000
@@ -45,6 +45,8 @@
LIBDIR = @libdir@
VARDIR = @localstatedir@
MANDIR = @mandir@
+INCLUDEDIR = @includedir@
+CONFDIR = @sysconfdir@
# The permissions to give the executables
INSTALLPERMS = 0755
@@ -52,10 +54,12 @@
# 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))
+
LOGFILEBASE = @logfilebase@
-CONFIGFILE = $(LIBDIR)/smb.conf
-LMHOSTSFILE = $(LIBDIR)/lmhosts
-DRIVERFILE = $(LIBDIR)/printers.def
+CONFIGFILE = $(CONFDIR)/smb.conf
+LMHOSTSFILE = $(CONFDIR)/lmhosts
+DRIVERFILE = $(CONFDIR)/printers.def
+
# This is where smbpasswd et al go
PRIVATEDIR = @privatedir@
@@ -812,7 +816,7 @@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TDBBACKUP_OBJ)
-install: installbin installman installscripts installdat installswat
+install: installbin installman installscripts installdat installswat installclientlib
installdirs:
@$(SHELL) $(srcdir)/script/installdirs.sh $(BASEDIR) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR)
@@ -824,6 +828,7 @@
@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(PROGS)
+
installscripts: installdirs
@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
@@ -834,9 +839,14 @@
@$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
installclientlib:
- -$(INSTALLCMD) bin/libsmbclient.so ${prefix}/lib
- -$(INSTALLCMD) -d ${prefix}/include
- -$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
+ @$(SHELL) $(srcdir)/script/installclientlib.sh $(INSTALLPERMS) $(BASEDIR) $(LIBDIR) $(INCLUDEDIR) @LIBSMBCLIENT_SHARED@ bin/libsmbclient.a include/libsmbclient.h
+# @$(SHELL) $(srcdir)/script/installclientlib.sh $(INSTALLPERMS) $(BASEDIR) $(INCLUDEDIR) $(LIBDIR) include/libsmbclient.h
+##this stuff tries to put files in the real /
+# -$(INSTALLCMD) bin/libsmbclient.so ${prefix}/lib
+# -$(INSTALLCMD) bin/libsmbclient.@SHLIBEXT@ ${prefix}/lib
+# -$(INSTALLCMD) bin/libsmbclient.a ${prefix}/lib
+# -$(INSTALLCMD) -d ${prefix}/include
+# -$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
# revert to the previously installed version
revert:
@@ -850,13 +860,14 @@
showlayout:
@echo "Samba will be installed into:"
- @echo " basedir: $(BASEDIR)"
- @echo " bindir: $(BINDIR)"
- @echo " sbindir: $(SBINDIR)"
- @echo " libdir: $(LIBDIR)"
- @echo " vardir: $(VARDIR)"
- @echo " mandir: $(MANDIR)"
-
+ @echo " basedir: $(BASEDIR)"
+ @echo " bindir: $(BINDIR)"
+ @echo " sbindir: $(SBINDIR)"
+ @echo " confdir: $(CONFDIR)"
+ @echo " libdir: $(LIBDIR)"
+ @echo " vardir: $(VARDIR)"
+ @echo " mandir: $(MANDIR)"
+ @echo " includedir: $(INCLUDEDIR)"
uninstall: uninstallman uninstallbin uninstallscripts
Index: source/configure.in
===================================================================
RCS file: /cvsroot/samba/source/configure.in,v
retrieving revision 1.324
diff -u -r1.324 configure.in
--- source/configure.in 27 Jul 2002 01:37:32 -0000 1.324
+++ source/configure.in 29 Jul 2002 16:00:53 -0000
@@ -17,6 +17,7 @@
logfilebase="\${VARDIR}/log/samba"
privatedir="\${CONFIGDIR}/private"
swatdir="\${DATADIR}/samba/swat",
+
configdir="\$(LIBDIR)"
logfilebase="\$(VARDIR)"
lockdir="\${VARDIR}/locks"
Index: source/script/installdirs.sh
===================================================================
RCS file: /cvsroot/samba/source/script/installdirs.sh,v
retrieving revision 1.1
diff -u -r1.1 installdirs.sh
--- source/script/installdirs.sh 13 Mar 2002 01:21:02 -0000 1.1
+++ source/script/installdirs.sh 29 Jul 2002 16:00:53 -0000
@@ -6,8 +6,9 @@
LIBDIR=$4
VARDIR=$5
PRIVATEDIR=$6
+CONFDIR=$7
-for d in $BASEDIR $SBINDIR $BINDIR $LIBDIR $VARDIR $PRIVATEDIR; do
+for d in $BASEDIR $SBINDIR $BINDIR $LIBDIR $VARDIR $PRIVATEDIR $CONFDIR; do
if [ ! -d $d ]; then
mkdir $d
if [ ! -d $d ]; then
