diff options
author | Andrew Bartlett <abartlet@samba.org> | 2002-03-13 01:21:02 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2002-03-13 01:21:02 +0000 |
commit | 7451e73ae28b91a77520347c73eedf40d5cad2e9 (patch) | |
tree | c984534e41c9ced3fdd58b79a219620ec83e0936 /source3/Makefile.in | |
parent | b0ace3183f07692892ad793122e61dc244872ca3 (diff) | |
download | samba-7451e73ae28b91a77520347c73eedf40d5cad2e9.tar.gz samba-7451e73ae28b91a77520347c73eedf40d5cad2e9.tar.bz2 samba-7451e73ae28b91a77520347c73eedf40d5cad2e9.zip |
Move the directory creation process outside the 'installbin.sh' script, and
into its own. The 'installdirs' makefile entry didn't do anything on my laptop,
so it has been replaced with the section from installbin.sh.
This also fixes the bug that we ignored the setting of $(PRIVATEDIR) when
making the directories.
Finally, link pam_winbind with .po objects only, not a mix of .o and .po
(as per Don Mccall's request).
Andrew Bartlett
(This used to be commit c7a883df28da9dd6fb88198df22c4d78bf8acd8b)
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index ffea02b43d..30f616c097 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -322,7 +322,7 @@ SAMSYNC_OBJ = $(SAMSYNC_OBJ1) \ $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_OBJ) \ $(GROUPDB_OBJ) -PAM_WINBIND_OBJ = nsswitch/pam_winbind.po nsswitch/wb_common.po lib/snprintf.o +PAM_WINBIND_OBJ = nsswitch/pam_winbind.po nsswitch/wb_common.po lib/snprintf.po SMBW_OBJ = smbwrapper/smbw.o \ smbwrapper/smbw_dir.o smbwrapper/smbw_stat.o \ @@ -758,8 +758,7 @@ bin/tdbbackup: $(TDBBACKUP_OBJ) bin/.dummy install: installbin installman installscripts installswat installdirs: - -$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \ - $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(BASEDIR) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) installservers: all installdirs @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS) |