summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2002-11-30 14:10:06 +0000
committersalo <salo@pkgsrc.org>2002-11-30 14:10:06 +0000
commit0f046841135e8ebe6406c2dcf7717d0122ef7708 (patch)
tree7a4c299f575b7fc215c37cb51a8480ab98eab74d /mk
parentbb2abd1ee219aa3ed546c71c41ef8317af7b8508 (diff)
downloadpkgsrc-0f046841135e8ebe6406c2dcf7717d0122ef7708.tar.gz
Conditionalize _PKGLOCALEDIR_FILES pattern for ${FIND}. Some packages need
patching Makefile not Makefile.in. Depends on HAS_CONFIGURE || GNU_CONFIGURE.
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink2/bsd.buildlink2.mk13
1 files changed, 9 insertions, 4 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index 2290eff183d..7dce24ab9fd 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.58 2002/11/28 14:21:34 salo Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.59 2002/11/30 14:10:06 salo Exp $
#
# An example package buildlink2.mk file:
#
@@ -418,8 +418,13 @@ USE_PKGLOCALEDIR?= no
_PKGLOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale
BUILDLINK_SUBST_MESSAGE.pkglocaledir= \
"Fixing locale directory references."
+.if defined(HAS_CONFIGURE) || defined(GNU_CONFIGURE)
+_PKGLOCALEDIR_FILES= "Makefile.in\*"
+.else
+_PKGLOCALEDIR_FILES= "Makefile\*"
+.endif
BUILDLINK_SUBST_FILES.pkglocaledir= \
- `${FIND} . -name "Makefile.in*" -print | ${GREP} -v "\.orig"`
+ `${FIND} . -name "${_PKGLOCALEDIR_FILES}" -print | ${GREP} -v "\.orig"`
BUILDLINK_SUBST_SED.pkglocaledir= \
-e 's|^\(localedir[ ]*=\).*|\1 ${_PKGLOCALEDIR}|' \
-e 's|^\(gnulocaledir[ ]*=\).*|\1 ${_PKGLOCALEDIR}|' \
@@ -427,10 +432,10 @@ BUILDLINK_SUBST_SED.pkglocaledir= \
pkglocaledir-buildlink-subst: _BUILDLINK_SUBST_USE
-.if (${PKGLOCALEDIR} != "share") && empty(USE_PKGLOCALEDIR:M[nN][oO])
-
+.if (${PKGLOCALEDIR} != "share") && empty(USE_PKGLOCALEDIR:M[nN][oO])
pre-configure: pkglocaledir-buildlink-subst
.endif
+
# When "unbuildlinkifying" a file, we must remove references to the
# buildlink directories and change any -llib to the proper replacement
# libraries (-lreadline -> -ledit, etc.). Redundant -Idir and -Ldir