summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-05 21:30:00 +0000
committerjlam <jlam>2004-02-05 21:30:00 +0000
commit42186e15e28bc808e92c06686a637aa8e9a096aa (patch)
treeb1405a98ed5b87cf251452a4248652625124d5e1 /devel
parentc9f2f0e8b314480d61413ff28e4f8c59c9448405 (diff)
downloadpkgsrc-42186e15e28bc808e92c06686a637aa8e9a096aa.tar.gz
Reorder some lines so they appear before bsd.prefs.mk and set
USE_BUILDLINK3 to "yes". This should fix installation of libtool-base using gcc3 from pkgsrc.
Diffstat (limited to 'devel')
-rw-r--r--devel/libtool-base/Makefile6
-rw-r--r--devel/libtool/Makefile.common6
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 86d35808002..133d52b3c1a 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2004/02/05 20:14:06 skrll Exp $
+# $NetBSD: Makefile,v 1.22 2004/02/05 21:30:00 jlam Exp $
#
-.include "../libtool/Makefile.common"
-
PKGNAME= ${DISTNAME:C/-/-base-/}
SVR4_PKGNAME= ltoob
@@ -15,6 +13,8 @@ CONFLICTS+= libtool<=1.3.5nb11
#
USE_LANGUAGES= c c++
+.include "../../devel/libtool/Makefile.common"
+
TEST_TARGET= check
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 32aed7fab20..a51026f37e2 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2004/02/05 20:14:06 skrll Exp $
+# $NetBSD: Makefile.common,v 1.42 2004/02/05 21:30:00 jlam Exp $
#
DISTNAME= libtool-1.5.2
@@ -12,8 +12,8 @@ CONFLICTS= glibtool-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-GNU_CONFIGURE= # defined
-USE_BUILDLINK3= # defined
+GNU_CONFIGURE= yes
+USE_BUILDLINK3= yes
DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo
FILESDIR= ${.CURDIR}/../libtool/files