From 70e28b42cd0b3d1b2b2dc05ba35c56f84f4a0671 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 29 Feb 2004 10:28:24 +0000
Subject: Revert: revision 1.29 date: 2004/02/18 19:13:30;  author: jlam; 
 state: Exp;  lines: +23 -23 Configure and build shlibtool after configuring
 and building libtool, resepectively.  This makes the build output look more
 logically grouped into phases. to make this build again on 1.5.x systems.
 Addresses PR 24588.

---
 devel/libtool-base/Makefile | 46 ++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'devel')

diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index f0cf53b3941..89a8ef7fa60 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/02/22 12:22:47 grant Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/29 10:28:24 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:C/-/-base-/}
@@ -55,39 +55,39 @@ CONFIGURE_ENV+=		lt_cv_path_NM="nm -p"
 .  include "../../devel/dlcompat/buildlink3.mk"
 .endif
 
-BUILD_SHLIBTOOL?=	yes
-BUILDING_SHLIBTOOL=	no
+BUILD_SHLIBTOOL?=	YES
+BUILDING_SHLIBTOOL?=	NO
 
-.if !empty(BUILD_SHLIBTOOL:M[nN][oO])
-PLIST_SUBST+=		SHLIBTOOL="@comment"
+.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
 SHLIBTOOL_WRKDIR=	${WRKDIR}/shlibtool
 SHLIBTOOL_WRKSRC=	${WRKSRC:S/${WRKDIR}/${SHLIBTOOL_WRKDIR}/}
-SHLIBTOOL_MAKEFLAGS=	BUILDING_SHLIBTOOL=yes
+SHLIBTOOL_MAKEFLAGS=	BUILDING_SHLIBTOOL=YES
 SHLIBTOOL_MAKEFLAGS+=	WRKDIR=${SHLIBTOOL_WRKDIR}
-PLIST_SUBST+=		SHLIBTOOL=
-.  if !empty(BUILDING_SHLIBTOOL:M[yY][eE][sS])
-CONFIGURE_ARGS+=	--disable-static
+
+.  if ${BUILD_SHLIBTOOL} == "NO"
+PLIST_SUBST+=		SHLIBTOOL="@comment "
 .  else
-post-configure:
-	cd ${.CURDIR} && ${MAKE} configure ${SHLIBTOOL_MAKEFLAGS}
+PLIST_SUBST+=		SHLIBTOOL=
 
 post-build:
 	cd ${.CURDIR} && ${MAKE} build ${SHLIBTOOL_MAKEFLAGS}
-.  endif
 
 post-install:
-	${INSTALL_SCRIPT} ${SHLIBTOOL_WRKSRC}/libtool ${PREFIX}/bin/shlibtool
+	${INSTALL_SCRIPT} ${SHLIBTOOL_WRKSRC}/libtool			\
+		${PREFIX}/bin/shlibtool
+.  endif
 .endif
 
-.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
-
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3