diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-11 05:43:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:20:05 -0500 |
| commit | 2696764132aea0fe61306a3516d27241a87ade35 (patch) | |
| tree | f146c7678b4cdd01eef2354d6a5932b6729f0d9c | |
| parent | 54ffd4fdbf470cb71cbf9a9c9e5aa37f73acc559 (diff) | |
| download | samba-2696764132aea0fe61306a3516d27241a87ade35.tar.gz samba-2696764132aea0fe61306a3516d27241a87ade35.tar.bz2 samba-2696764132aea0fe61306a3516d27241a87ade35.zip | |
r8314: - added an 'installmisc' target for installing miscellaneous files.
- install our provisioning template files in lib/setup/
We need these to be installed as users may wish to re-provision after
installation, or may not have the source tree (wuch as when installing
from binary packages)
(This used to be commit 7c2e31fd11be3ebed680a0fe08a9ff09f7b97c87)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 5 | ||||
| -rwxr-xr-x | source4/script/installmisc.sh | 19 | ||||
| -rw-r--r-- | source4/script/installswat.sh | 6 |
3 files changed, 23 insertions, 7 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index e7febd0b26..2f15274a14 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -669,7 +669,7 @@ GTK_PROGS = bin/gregedit \ bin/gwsam \ bin/gepdump -install: showlayout installbin installtorture installldb installreg installdat installswat installgtk +install: showlayout installbin installtorture installldb installreg installdat installswat installmisc installgtk # DESTDIR is used here to prevent packagers wasting their time # duplicating the Makefile. Remove it and you will have the privilege @@ -704,6 +704,9 @@ installdat: installdirs installswat: installdirs @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR)$(SWATDIR) $(srcdir) $(DESTDIR)$(LIBDIR) +installmisc: installdirs + @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(LIBDIR) + installman: installdirs @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(MANPAGES) diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh new file mode 100755 index 0000000000..580dc855d4 --- /dev/null +++ b/source4/script/installmisc.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# install miscellaneous files + +SRCDIR=$1 +LIBDIR=$2 + +cd $SRCDIR || exit 1 + +echo "Installing js libs" +mkdir -p $LIBDIR/js || exit 1 +cp scripting/libjs/*.js $LIBDIR/js || exit 1 + +echo "Installing setup templates" +mkdir -p $LIBDIR/setup || exit 1 +cp setup/*.ldif $LIBDIR/setup || exit 1 +cp setup/*.zone $LIBDIR/setup || exit 1 +cp setup/*.conf $LIBDIR/setup || exit 1 + +exit 0 diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh index 05245d8f06..f3a0ceb258 100644 --- a/source4/script/installswat.sh +++ b/source4/script/installswat.sh @@ -27,12 +27,6 @@ installdir scripting/*.ejs scripting/*.esp scripting/*.js installdir style/*.css installdir docs/*.js - -echo "Installing js libs" -cd ../source/scripting || exit 1 -mkdir -p $LIBDIR/js -cp libjs/*.js $LIBDIR/js - cat << EOF ====================================================================== The swat files have been installed. |