From 84891b048d577e52da91c64d310f7bafa115d015 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 1 Apr 2010 15:20:25 +0200 Subject: s4-python: Install external packages to a different directory but import into the normal namespace when the system doesn't have it available. --- source4/script/installmisc.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source4/script/installmisc.sh') diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh index 6a53b988f5..5538681c52 100755 --- a/source4/script/installmisc.sh +++ b/source4/script/installmisc.sh @@ -83,12 +83,13 @@ cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1 echo "Installing external python libraries" mkdir -p $DESTDIR$PYTHONDIR || exit 1 -for p in $($PYTHON scripting/python/samba_external/missing.py); +MISSING="$($PYTHON scripting/python/samba_external/missing.py)" +for p in $MISSING do package=`basename $p` echo "Installing missing python package $package" - mkdir -p $DESTDIR$PYTHONDIR/$package - cp -r ../lib/$p/* $DESTDIR$PYTHONDIR/$package/ || exit 1 + mkdir -p $DESTDIR$PYTHONDIR/samba/external/$package + cp -r ../lib/$p/* $DESTDIR$PYTHONDIR/samba/external/$package/ || exit 1 done echo "Installing stuff in $PRIVATEDIR" -- cgit