summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorfredb <fredb>2000-03-25 17:17:37 +0000
committerfredb <fredb>2000-03-25 17:17:37 +0000
commit8628b7954bf1c8ade51c2cb823429ba9d5015a16 (patch)
tree3fdc29ab0d134178bb6f9ad9d718cab691e5f939 /mk
parent788ac4840f7b6f09a775afd8d9c853dc1857e6a1 (diff)
downloadpkgsrc-8628b7954bf1c8ade51c2cb823429ba9d5015a16.tar.gz
Deal with some hidden dependencies, commonly induced by Gnu configure, by
setting M4, and by adding M4 and YACC to CONFIGURE_ENV (YACC is already set, for NetBSD, in "sys.mk"). If it turns out that a package really needs "gm4" for "m4", or "bison -y" for "yacc", the corresponding variable will have to be set in the package's Makefile (and the explicit dependency added, too).
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7a1ae02071b..8ed17356249 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.418 2000/03/13 17:47:07 hubertf Exp $
+# $NetBSD: bsd.pkg.mk,v 1.419 2000/03/25 17:17:37 fredb Exp $
#
# This file is in the public domain.
#
@@ -211,12 +211,16 @@ MD5?= md5
MD5_FILE?= ${FILESDIR}/md5
PATCH_SUM_FILE?= ${FILESDIR}/patch-sum
+.if exists(/usr/bin/m4)
+M4?= /usr/bin/m4
+.endif
+
.if defined(USE_MOTIF) || defined(USE_X11BASE) || defined(USE_X11)
LDFLAGS+= -Wl,-R${MOTIFBASE}/lib -L${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib
.endif
LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
MAKE_ENV+= LDFLAGS="${LDFLAGS}"
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" M4="${M4}" YACC="${YACC}"
MAKE_FLAGS?=
MAKEFILE?= Makefile