diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 2 | ||||
| -rwxr-xr-x | source4/script/installmisc.sh | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 820ccfaf6c1..3c17f5e9c2f 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 580dc855d45..dab1b527ca2 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 |