diff options
| author | Lars Müller <lmuelle@samba.org> | 2006-03-22 20:16:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:42 -0500 |
| commit | 853ad11aaf281d8f83561bd273b3271ff7f388cc (patch) | |
| tree | 51827d35f74b03efbe6d7a2ae07c4cf77fd5bec8 /source3/Makefile.in | |
| parent | 20204ab040247d431060b9a53ca6437024d76d6c (diff) | |
| download | samba-853ad11aaf281d8f83561bd273b3271ff7f388cc.tar.gz samba-853ad11aaf281d8f83561bd273b3271ff7f388cc.tar.bz2 samba-853ad11aaf281d8f83561bd273b3271ff7f388cc.zip | |
r14659: Fix installpammodules for shells where a
for module in ; do ... ; done
leads to an error (true64, solaris 8).
We now use {,UN}INSTALL_PAM_MODULES to get replaced by configure.
Therfore we don't run into the {,un}installpammodules rule if no PAM
module is requested.
Thanks to Björn Jacke for pointing to this issue.
(This used to be commit 07a70f8f861235ba4037aacb9cc835b6d18f51c3)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 97348ff735..ac67388d6a 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1414,7 +1414,7 @@ bin/t_snprintf@EXEEXT@: lib/snprintf.c bin/timelimit@EXEEXT@: script/tests/timelimit.c $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) script/tests/timelimit.c -install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ installpammodules +install: installservers installbin @INSTALL_CIFSMOUNT@ installman installscripts installdat installswat installmodules @INSTALL_LIBSMBCLIENT@ @INSTALL_LIBMSRPC@ @INSTALL_PAM_MODULES@ install-everything: install installmodules @@ -1481,9 +1481,7 @@ installlibmsrpc: installdirs libmsrpc -$(INSTALLCMD) $(srcdir)/include/libmsrpc.h $(DESTDIR)${prefix}/include installpammodules: $(PAM_MODULES) - @if test "$(PAM_MODULES)"; then \ - $(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(PAMMODULESDIR); \ - fi + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS) $(DESTDIR) $(PAMMODULESDIR) @for module in $(PAM_MODULES); do \ echo "Installing module $${module} as $(DESTDIR)/$(PAMMODULESDIR)/$${module}.@SHLIBEXT@ "; \ install -m $(INSTALLPERMS) bin/$${module}.@SHLIBEXT@ \ @@ -1546,7 +1544,7 @@ showlayout: @echo " swatdir: $(SWATDIR)" -uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ uninstallpammodules +uninstall: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ uninstallscripts uninstalldat uninstallswat uninstallmodules @UNINSTALL_LIBSMBCLIENT@ @UNINSTALL_LIBMSRPC@ @UNINSTALL_PAM_MODULES@ uninstallman: @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C |