* Fix for bug 290:

	smbadduser must obeys the paths from configure options

* Try to get libsmbclient files installed during 'make install'
  Still one outstanding problem with static lib.  INSTALLCLIENTCMD_A
  is not getting set correctly.
(This used to be commit 50ab28bd2524187b851732176553382fb811a051)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c08dacaaad934eb76bf3725709703a742dfb7df3..940c431ed01548110e9ea99d9041823d065e3650 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1137,7 +1137,7 @@ bin/t_push_ucs2@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_push_ucs2.o
 
 bin/t_snprintf@EXEEXT@: lib/snprintf.c
        $(CC) $(FLAGS) -o $@ -DTEST_SNPRINTF lib/snprintf.c -lm
-install: installbin installman installscripts installdat installswat installmodules
+install: installbin installman installscripts installdat installswat installmodules @INSTALLCLIENT@
 
 install-everything: install installmodules
 

diff --git a/source3/configure.in b/source3/configure.in
index a94f7d9e8630efab8f0ba9008d3afcf95a1c0dc8..241c6ec76fa09c5972f4f11215797bfb2f3d851d 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -145,6 +145,7 @@ AC_SUBST(PICFLAG)
 AC_SUBST(PICSUFFIX)
 AC_SUBST(POBAD_CC)
 AC_SUBST(SHLIBEXT)
+AC_SUBST(INSTALLCLIENT)
 AC_SUBST(INSTALLCLIENTCMD_SH)
 AC_SUBST(INSTALLCLIENTCMD_A)
 AC_SUBST(LIBSMBCLIENT_SHARED)
@@ -3144,6 +3145,7 @@ AC_ARG_WITH(manpages-langs,
 
 INSTALLCLIENTCMD_SH=:
 INSTALLCLIENTCMD_A=:
+INSTALLCLIENT=
 LIBSMBCLIENT_SHARED=
 LIBSMBCLIENT=
 AC_MSG_CHECKING(whether to build the libsmbclient shared library)
@@ -3167,6 +3169,7 @@ AC_ARG_WITH(libsmbclient,
         INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
         LIBSMBCLIENT=libsmbclient
      fi
+     INSTALLCLIENT=installclietlib
      ;;
   esac ],
 [
@@ -3184,6 +3187,7 @@ AC_ARG_WITH(libsmbclient,
      INSTALLCLIENTCMD_A="\$(INSTALLCMD)"
      LIBSMBCLIENT=libsmbclient
   fi]
+  INSTALLCLIENT=installclientlib
 )
 
 
@@ -4061,7 +4065,7 @@ dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
 CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
 CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
 
-AC_OUTPUT(include/stamp-h Makefile script/findsmb)
+AC_OUTPUT(include/stamp-h Makefile script/findsmb smbadduser)
 
 #################################################
 # Print very concise instructions on building/use

diff --git a/source3/smbadduser b/source3/smbadduser.in
old mode 100755 (executable)
new mode 100644 (file)
similarity index 90%
rename from source3/smbadduser
rename to source3/smbadduser.in
index 9837413..05da7de
--- a/source3/smbadduser
+++ b/source3/smbadduser.in
@@ -2,13 +2,19 @@
 #
 # smbadduser - Written by Mike Zakharoff
 #
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+LIBDIR=@libdir@
+PRIVATEDIR=@privatedir@
+CONFIGDIR=@configdir@
+
 unalias *
 set path = ($path /usr/local/samba/bin)
 
-set smbpasswd = /usr/local/samba/private/smbpasswd
-#set smbpasswd = /etc/samba/smbpasswd
-set user_map  = /usr/local/samba/lib/users.map
-#set user_map  = /etc/samba/smbusers
+set smbpasswd = $PRIVATEDIR/smbpasswd
+set user_map  = $CONFIGDIR/users.map
+
 #
 # Set to site specific passwd command
 #