diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2010-03-08 20:36:16 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2010-03-08 20:37:36 +0100 |
| commit | fde707aa0c563d239c2f8c442cddfee0b6ff057f (patch) | |
| tree | a0c8e702cc7f99c16c02e7521c3bf095e9d32f31 | |
| parent | a34eafc693d8750c0883823068e5c6f7355efa04 (diff) | |
| download | samba-fde707aa0c563d239c2f8c442cddfee0b6ff057f.tar.gz samba-fde707aa0c563d239c2f8c442cddfee0b6ff057f.tar.bz2 samba-fde707aa0c563d239c2f8c442cddfee0b6ff057f.zip | |
s4:"dns_update_list" file: install it properly into the private directory
This is what the "samba_dnsupdate" script requests (line 220).
| -rw-r--r-- | source4/Makefile | 2 | ||||
| -rwxr-xr-x | source4/script/installmisc.sh | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/source4/Makefile b/source4/Makefile index 0da1ee2626..dd9376b476 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -243,7 +243,7 @@ installman:: manpages installdirs @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(mandir) $(MANPAGES) installmisc:: installdirs - @$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON) + @$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(DESTDIR)$(privatedir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON) installpc:: installdirs @$(SHELL) $(srcdir)/script/installpc.sh $(builddir) $(DESTDIR)$(pkgconfigdir) $(PC_FILES) diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh index 36a102a543..5c7d76d5e4 100755 --- a/source4/script/installmisc.sh +++ b/source4/script/installmisc.sh @@ -1,18 +1,19 @@ #!/bin/sh # install miscellaneous files -[ $# -eq 7 ] || { - echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR BINDDIR SBINDDIR PYTHONDIR PYTHON" +[ $# -eq 8 ] || { + echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR PRIVATEDIR BINDDIR SBINDDIR PYTHONDIR PYTHON" exit 1 } DESTDIR="$1" SRCDIR="$2" SETUPDIR="$3" -BINDIR="$4" -SBINDIR="$5" -PYTHONDIR="$6" -PYTHON="$7" +PRIVATEDIR="$4" +BINDIR="$5" +SBINDIR="$6" +PYTHONDIR="$7" +PYTHON="$8" cd $SRCDIR || exit 1 @@ -89,5 +90,7 @@ do cp -r scripting/python/samba_external/$p/* $PYTHONDIR/samba_external/$p/ || exit 1 done +echo "Installing stuff in $PRIVATEDIR" +cp setup/dns_update_list $PRIVATEDIR || exit 1 exit 0 |