diff options
| -rw-r--r-- | source/Makefile | 7 | ||||
| -rwxr-xr-x | source/script/installtorture.sh | 18 | ||||
| -rwxr-xr-x | source/script/uninstalltorture.sh | 15 | ||||
| -rw-r--r-- | source/scripting/python/config.m4 | 6 |
4 files changed, 7 insertions, 39 deletions
diff --git a/source/Makefile b/source/Makefile index f96a07a1133..66b092192e4 100644 --- a/source/Makefile +++ b/source/Makefile @@ -210,11 +210,7 @@ installdirs:: $(DESTDIR)$(PKGCONFIGDIR) \ $(DESTDIR)$(sysconfdir) -installbin:: $(SBIN_PROGS) $(BIN_PROGS) $(TORTURE_PROGS) installdirs - @$(SHELL) $(srcdir)/script/installtorture.sh \ - $(INSTALLPERMS) \ - $(DESTDIR)$(TORTUREDIR) \ - $(TORTURE_PROGS) +installbin:: installdirs installplugins:: @@ -262,7 +258,6 @@ $(DESTDIR)$(sbindir)/%: bin/% installdirs @chmod $(INSTALLPERMS) $@ uninstallbin:: - @$(SHELL) $(srcdir)/script/uninstalltorture.sh $(DESTDIR)$(TORTUREDIR) $(TORTURE_PROGS) uninstalllib:: @$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(libdir) $(SHARED_LIBS) diff --git a/source/script/installtorture.sh b/source/script/installtorture.sh deleted file mode 100755 index db7ad9110c1..00000000000 --- a/source/script/installtorture.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -INSTALLPERMS=$1 -TORTUREDIR=$2 -shift -shift - -for p in $*; do - p2=`dirname $p` - base=`basename $p` - DESTDIR=$TORTUREDIR/`basename $p2` - mkdir -p $DESTDIR - echo Installing $p as $DESTDIR/$base - cp -f $p $DESTDIR/ - chmod $INSTALLPERMS $DESTDIR/$base -done - -exit 0 diff --git a/source/script/uninstalltorture.sh b/source/script/uninstalltorture.sh deleted file mode 100755 index 0c6e4ec9917..00000000000 --- a/source/script/uninstalltorture.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -TORTUREDIR=$1 -shift -shift - -for p in $*; do - p2=`dirname $p` - base=`basename $p` - DESTDIR=$TORTUREDIR/`basename $p2` - echo Removing $DESTDIR/$base - rm -f $p $DESTDIR/ -done - -exit 0 diff --git a/source/scripting/python/config.m4 b/source/scripting/python/config.m4 index b599aaefb03..af13b6ae694 100644 --- a/source/scripting/python/config.m4 +++ b/source/scripting/python/config.m4 @@ -50,6 +50,12 @@ if test -z "$PYTHON_CONFIG"; then else TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`]) TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`]) + if x$working_python = xno; then + # It seems the library path isn't included on some systems + base=`$PYTHON_CONFIG --prefix` + TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`]) + TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`]) + fi fi if test x$PYTHON != x |