From b58a0bac898eea6f5ec82a8e2c34ef72c9e484d8 Mon Sep 17 00:00:00 2001 From: pancake Date: Tue, 13 Jul 2010 12:15:36 +0200 Subject: [PATCH] * Fix install-perl in swig/ * Run make clean before make mrproper --- build.sh | 6 ++++-- swig/Makefile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index cb6b7cd52a..dcdf7df120 100644 --- a/build.sh +++ b/build.sh @@ -222,7 +222,8 @@ else fi if [ -e "config-user.mk" ]; then - log "[==] Running mrproper..." + log "[==] Running clean and mrproper..." + ${MAKE} clean 2>&1 > /dev/null ${MAKE} mrproper 2>&1 > /dev/null fi @@ -293,7 +294,8 @@ done if [ -n "$cc" ]; then log "[==] mingw32 build using $cc" if [ -e "config-user.mk" ]; then - ${MAKE} ${MAKEFLAGS} mrproper 2>&1 >/dev/null + ${MAKE} clean 2>&1 > /dev/null + ${MAKE} mrproper 2>&1 >/dev/null fi log "[==] mingw32 configure" logcmd ./configure --without-gmp --with-ostype=windows --with-compiler=$cc --host=i586-unknown-windows diff --git a/swig/Makefile b/swig/Makefile index 4dfba2c57a..293dc335e3 100644 --- a/swig/Makefile +++ b/swig/Makefile @@ -78,7 +78,7 @@ install-ruby: install-perl: @if [ "`grep perl supported.langs`" ]; then \ - target=${DESTDIR}`perl -e 'for (@INC) { print "$$_\n" if /lib\/perl5/ && !/local/; }'` ; \ + target=${DESTDIR}`perl -e 'for (@INC) { print "$$_\n" if /lib\/perl5/ && !/local/; }'|head -n 1` ; \ mkdir -p $$target/r2 ; \ echo "Installing perl r2 modules..." ; \ cp -rf perl/*.so $$target/r2 ; \