[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  f1ecdb9... s4:setup/wscript_build: install dns_update_list into ${SETUPDIR}
       via  d19033e... Revert "Revert "s4:script/installmisc.sh - install "dns_update_list" to target setup folder""
       via  d8c3541... Revert "s4:"dns_update_list" file: install it properly into the private directory"
      from  7233699... s4:dynconfig/wscript: ${LOCALSTATEDIR} already has var/ included

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f1ecdb980b8a63b7facd62e737ba49d5bfddf80b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 16:30:02 2010 +0200

    s4:setup/wscript_build: install dns_update_list into ${SETUPDIR}
    
    metze

commit d19033e1e91bf93cc73e7cedaf84d536fa28e533
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 16:26:59 2010 +0200

    Revert "Revert "s4:script/installmisc.sh - install "dns_update_list" to target setup folder""
    
    This reverts commit a34eafc693d8750c0883823068e5c6f7355efa04.
    
    This commit was correct.
    
    metze

commit d8c3541ca8b012cb686a1517886132da574e8c55
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Apr 15 16:25:37 2010 +0200

    Revert "s4:"dns_update_list" file: install it properly into the private directory"
    
    This reverts commit fde707aa0c563d239c2f8c442cddfee0b6ff057f.
    
    This is wrong, we need to install it into the setup directory,
    so that provision will find it and copy it to private dir.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/Makefile.in           |    2 +-
 source4/script/installmisc.sh |   16 +++++++---------
 source4/setup/wscript_build   |    2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/Makefile.in b/source4/Makefile.in
index 3d9b1f2..40ea286 100644
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -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)$(privatedir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(pythondir) $(PYTHON)
+	@$(SHELL) $(srcdir)/script/installmisc.sh "$(DESTDIR)" $(srcdir) $(DESTDIR)$(setupdir) $(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 32a2ee4..d8fd156 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -1,19 +1,18 @@
 #!/bin/sh
 # install miscellaneous files
 
-[ $# -eq 8 ] || {
-    echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR PRIVATEDIR BINDDIR SBINDDIR PYTHONDIR PYTHON"
+[ $# -eq 7 ] || {
+    echo "Usage: installmisc.sh DESTDIR SRCDIR SETUPDIR BINDDIR SBINDDIR PYTHONDIR PYTHON"
     exit 1
 }
 
 DESTDIR="$1"
 SRCDIR="$2"
 SETUPDIR="$3"
-PRIVATEDIR="$4"
-BINDIR="$5"
-SBINDIR="$6"
-PYTHONDIR="$7"
-PYTHON="$8"
+BINDIR="$4"
+SBINDIR="$5"
+PYTHONDIR="$6"
+PYTHON="$7"
 
 cd $SRCDIR || exit 1
 
@@ -80,6 +79,7 @@ cp setup/named.conf.update $SETUPDIR || exit 1
 cp setup/provision.smb.conf.dc $SETUPDIR || exit 1
 cp setup/provision.smb.conf.member $SETUPDIR || exit 1
 cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
+cp setup/dns_update_list $SETUPDIR || exit 1
 
 echo "Installing external python libraries"
 mkdir -p $DESTDIR$PYTHONDIR || exit 1
@@ -93,7 +93,5 @@ do
   cp -r ../lib/$p/* $DESTDIR$PYTHONDIR/samba/external/$package/ || exit 1
 done
 
-echo "Installing stuff in $PRIVATEDIR"
-cp setup/dns_update_list $PRIVATEDIR || exit 1
 
 exit 0
diff --git a/source4/setup/wscript_build b/source4/setup/wscript_build
index 59112b8..97d26a3 100644
--- a/source4/setup/wscript_build
+++ b/source4/setup/wscript_build
@@ -6,7 +6,7 @@ bld.INSTALL_WILDCARD('${SETUPDIR}', 'display-specifiers/*.txt')
 O755 = 493
 bld.INSTALL_FILES('${SBINDIR}','provision', chmod=O755, python_fixup=True)
 
-bld.INSTALL_FILES('${PRIVATEDIR}', 'dns_update_list')
+bld.INSTALL_FILES('${SETUPDIR}', 'dns_update_list')
 
 for p in '''schema-map-* DB_CONFIG *.inf *.ldif *.reg *.zone *.conf *.php *.txt
             named.conf named.conf.update provision.smb.conf.dc provision.smb.conf.member


-- 
Samba Shared Repository