Tweaked the installdirs target to ignore errors. This allows RPMS to be

built as non-root user, assuming you have permissions set up properly
in your /usr/src/redhat directory.

Added nsswitch sub-target to all target.
(This used to be commit 109840bb3abd75370e8ec14bf08bae35d04bcdaf)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c28583928adac60117b74ec2f39bb92a8a475e65..ac3c301b5fc7b42bd1f9f9a787105ae9157f1043 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -401,7 +401,7 @@ WINBIND_NSS_PICOBJS = $(WINBIND_NSS_OBJ:.o=.po)
 ######################################################################
 # now the rules...
 ######################################################################
-all : CHECK include/proto.h $(SPROGS) $(PROGS) $(SHLIBS)
+all : CHECK include/proto.h $(SPROGS) $(PROGS) $(SHLIBS) nsswitch
 
 pam_smbpass : CHECK bin/pam_smbpass.@SHLIBEXT@
 
@@ -641,7 +641,7 @@ bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ)
 install: installbin installman installscripts installswat
 
 installdirs:
-       $(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
+       -$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
        $(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR)
 
 installservers: all installdirs