diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-04-01 15:20:25 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-04-01 15:33:07 +0200 |
| commit | 84891b048d577e52da91c64d310f7bafa115d015 (patch) | |
| tree | 959c0794c00b484553ac876e21ee55cc3fa27d7c /source4/script | |
| parent | 64c564291d9ce60d934273aaac15150386d22127 (diff) | |
| download | samba-84891b048d577e52da91c64d310f7bafa115d015.tar.gz samba-84891b048d577e52da91c64d310f7bafa115d015.tar.bz2 samba-84891b048d577e52da91c64d310f7bafa115d015.zip | |
s4-python: Install external packages to a different directory but import into
the normal namespace when the system doesn't have it available.
Diffstat (limited to 'source4/script')
| -rwxr-xr-x | source4/script/installmisc.sh | 7 |
1 files changed, 4 insertions, 3 deletions
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" |