From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 29 Sep 2008 22:29:03 +0000 (+0200)
Subject: Fix installation of misc files.
X-Git-Tag: samba-4.0.0alpha6~769^2~228^2~91^2~27
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=f379f67dd287292e3bb7b606f1bdc3fe7a8db59c;p=bbaumbach%2Fsamba-autobuild%2F.git

Fix installation of misc files.
---

diff --git a/pidl/config.mk b/pidl/config.mk
index 07c8647ecd4..45582f5d568 100644
--- a/pidl/config.mk
+++ b/pidl/config.mk
@@ -1,13 +1,13 @@
 PIDL = $(PERL) $(pidldir)/pidl
 
 $(pidldir)/Makefile: $(pidldir)/Makefile.PL
-	cd $(pidldir) && $(PERL) Makefile.PL PREFIX=$(prefix)
+	@cd $(pidldir) && $(PERL) Makefile.PL PREFIX=$(prefix)
 
 pidl-testcov: $(pidldir)/Makefile
 	cd $(pidldir) && cover -test
 
 installpidl:: $(pidldir)/Makefile
-	$(MAKE) -C $(pidldir) install_vendor VENDORPREFIX=$(prefix) \
+	@$(MAKE) -C $(pidldir) install_vendor VENDORPREFIX=$(prefix) \
 		                           INSTALLVENDORLIB=$(datarootdir)/perl5 \
 								   INSTALLVENDORBIN=$(bindir) \
 								   INSTALLVENDORSCRIPT=$(bindir) \
diff --git a/source4/Makefile b/source4/Makefile
index 8f31979f214..71529305b45 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -107,6 +107,15 @@ comsrcdir := $(srcdir)/lib/com
 
 include data.mk
 
+$(foreach SCRIPT,$(wildcard scripting/bin/*),$(eval $(call binary_install_template,$(SCRIPT))))
+
+$(DESTDIR)$(bindir)/%: scripting/bin/% installdirs
+	@mkdir -p $(@D)
+	@echo Installing $(@F) as $@
+	@if test -f $@; then echo -n ""; rm -f $@.old; mv $@ $@.old; fi
+	@cp $< $@
+	@chmod $(INSTALLPERMS) $@
+
 pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
 
 DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
@@ -232,7 +241,7 @@ installman:: manpages installdirs
 	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES)
 
 installmisc:: installdirs
-	@$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir)
+	@$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(setupdir)
 
 installpc:: installdirs
 	@$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES)
@@ -242,7 +251,7 @@ uninstall:: uninstallbin uninstallsbin uninstalldat uninstallmisc uninstalllib u
 
 uninstallmisc::
 	@echo "Removing MISC files"
-	@cd $(DESTDIR)$(bindir); rm -f $(notdir $(miscbinfiles))
+	@rm -rf $(DESTDIR)$(setupdir)/*
 
 $(DESTDIR)$(bindir)/%: bin/% installdirs
 	@mkdir -p $(@D)
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index 507570318d9..e0cabef317b 100644
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -79,9 +79,6 @@ _PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
 /** SETUP files (source files used by the provision) */
 _PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;
 
-/** EJS Javascript library includes */
-_PUBLIC_ const char *dyn_JSDIR = JSDIR;
-
 /** Where to find the winbindd socket */
 _PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
 
diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index eb347307ba0..2bd34b119f3 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -3,7 +3,6 @@
 
 SRCDIR="$1"
 SETUPDIR="$2"
-BINDIR="$3"
 
 cd $SRCDIR || exit 1
 
@@ -25,9 +24,4 @@ cp setup/provision.smb.conf.dc $SETUPDIR || exit 1
 cp setup/provision.smb.conf.member $SETUPDIR || exit 1
 cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
 
-echo "Installing script tools"
-mkdir -p "$BINDIR"
-rm -f scripting/bin/*~
-cp scripting/bin/* $BINDIR/ || exit 1
-
 exit 0