diff options
| -rw-r--r-- | devel/libtool-base/Makefile | 12 | ||||
| -rw-r--r-- | devel/libtool/Makefile.common | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index 54791a93d9c..58735fc1d0b 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/09/18 16:25:12 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/01/05 11:12:46 jlam Exp $ # .include "../../devel/libtool/Makefile.common" @@ -35,6 +35,16 @@ CONFIGURE_ARGS= --enable-ltdl-install BUILD_SHLIBTOOL?= YES BUILDING_SHLIBTOOL?= NO +.PHONY: fix-libtool +fix-libtool: + cd ${WRKSRC}; for f in libtool; do \ + ${SED} -e "s,-L${BUILDLINK_DIR}/lib,," $$f > $$f.new; \ + if [ -x $$f ]; then ${CHMOD} +x $$f.new; fi; \ + ${MV} -f $$f.new $$f; \ + done + +post-build: fix-libtool + .if ${BUILDING_SHLIBTOOL} == "YES" CONFIGURE_ARGS+= --disable-static .else diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index e670c58e066..e32d56271e9 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.38 2004/01/05 09:50:47 cube Exp $ +# $NetBSD: Makefile.common,v 1.39 2004/01/05 11:12:46 jlam Exp $ # DISTNAME= libtool-ml-20010614 @@ -13,8 +13,10 @@ HOMEPAGE= http://www.gnu.org/software/libtool/libtool.html CONFLICTS= glibtool-[0-9]* +PKG_INSTALLATION_TYPES= overwrite pkgviews + GNU_CONFIGURE= # defined -USE_BUILDLINK2= # defined +USE_BUILDLINK3= # defined DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo FILESDIR= ${.CURDIR}/../libtool/files |