s4-python: Install external packages to a different directory but import into

[kai/samba.git] / source4 / script / installmisc.sh

diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index 36a102a54390afb41996594370871dd53f322790..5538681c52641f9e4e29795f735116a8718d5f40 100755 (executable)
--- 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
 
@@ -81,13 +82,17 @@ cp setup/provision.smb.conf.member $SETUPDIR || exit 1
 cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
 
 echo "Installing external python libraries"
-mkdir -p $PYTHONDIR/samba_external || exit 1
-for p in $($PYTHON scripting/python/samba_external/missing.py);
+mkdir -p $DESTDIR$PYTHONDIR || exit 1
+MISSING="$($PYTHON scripting/python/samba_external/missing.py)"
+for p in $MISSING
 do
-  echo "Installing missing python library $p"
-  mkdir -p $PYTHONDIR/samba_external/$p
-  cp -r scripting/python/samba_external/$p/* $PYTHONDIR/samba_external/$p/ || exit 1
+  package=`basename $p`
+  echo "Installing missing python package $package"
+  mkdir -p $DESTDIR$PYTHONDIR/samba/external/$package
+  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