diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-19 04:02:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:40 -0500 |
| commit | f3d61cc61545605cb8ea07b21b07577ccde4e1e8 (patch) | |
| tree | 527759d3dedf3621fbf6fc7cdd62982b32b165d7 /source4 | |
| parent | 340b3d7301d81ed46af261d8c948f0e77e052243 (diff) | |
| download | samba-f3d61cc61545605cb8ea07b21b07577ccde4e1e8.tar.gz samba-f3d61cc61545605cb8ea07b21b07577ccde4e1e8.tar.bz2 samba-f3d61cc61545605cb8ea07b21b07577ccde4e1e8.zip | |
r8576: install scripts from scripting/bin/
(This used to be commit a64490d1e5224c47437e07a0f1fbcbd8f197fdfd)
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 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 |