summaryrefslogtreecommitdiffstats
path: root/source4/script
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-03-31 03:56:24 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-03-31 03:56:24 +0200
commit5f3fcf7a7773737fd87c8ff5530fae2286e88927 (patch)
tree9337d53244a089f1eef9e4d32fd848cca8049eaf /source4/script
parent0e77bea165d6db9ca8a138e78f5051234b069789 (diff)
downloadsamba-5f3fcf7a7773737fd87c8ff5530fae2286e88927.tar.gz
samba-5f3fcf7a7773737fd87c8ff5530fae2286e88927.tar.xz
samba-5f3fcf7a7773737fd87c8ff5530fae2286e88927.zip
s4-python: Install external included packages only if they're not present on the system.
Diffstat (limited to 'source4/script')
-rwxr-xr-xsource4/script/installmisc.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index ddc25d3edca..6a53b988f5c 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -82,12 +82,13 @@ 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 $DESTDIR$PYTHONDIR/samba_external || exit 1
+mkdir -p $DESTDIR$PYTHONDIR || exit 1
for p in $($PYTHON scripting/python/samba_external/missing.py);
do
- echo "Installing missing python library $p"
- mkdir -p $DESTDIR$PYTHONDIR/samba_external/$p
- cp -r ../lib/$p/* $DESTDIR$PYTHONDIR/samba_external/$p/ || exit 1
+ package=`basename $p`
+ echo "Installing missing python package $package"
+ mkdir -p $DESTDIR$PYTHONDIR/$package
+ cp -r ../lib/$p/* $DESTDIR$PYTHONDIR/$package/ || exit 1
done
echo "Installing stuff in $PRIVATEDIR"