From f3d61cc61545605cb8ea07b21b07577ccde4e1e8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 19 Jul 2005 04:02:59 +0000
Subject: r8576: install scripts from scripting/bin/ (This used to be commit
 a64490d1e5224c47437e07a0f1fbcbd8f197fdfd)

---
 source4/build/smb_build/makefile.pm |  2 +-
 source4/script/installmisc.sh       | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'source4')

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 820ccfaf6c..3c17f5e9c2 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -712,7 +712,7 @@ installswat: installdirs
 	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) $(DESTDIR)$(LIBDIR)
 
 installmisc: installdirs
-	@$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(LIBDIR)
+	@$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR)
 
 installman: installdirs
 	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES)
diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index 580dc855d4..dab1b527ca 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 # install miscellaneous files
 
-SRCDIR=$1
-LIBDIR=$2
+SRCDIR="$1"
+LIBDIR="$2"
+BINDIR="$3"
 
 cd $SRCDIR || exit 1
 
@@ -16,4 +17,9 @@ cp setup/*.ldif $LIBDIR/setup || exit 1
 cp setup/*.zone $LIBDIR/setup || exit 1
 cp setup/*.conf $LIBDIR/setup || exit 1
 
+echo "Installing script tools"
+mkdir -p "$BINDIR"
+rm -f scripting/bin/*~
+cp scripting/bin/* $BINDIR/ || exit 1
+
 exit 0
-- 
cgit