sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

* Fix for bug 290:

Browse Source 
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)
This commit is contained in:
Gerald Carter 2003-08-22 18:00:17 +00:00
parent 16712a4c0d
commit eff91556a3
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/Makefile.in
View File

@ -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

6
source3/configure.in
View File

@ -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

14
source3/smbadduser → source3/smbadduser.in Executable file → Normal file
View File

@ -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
#