diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-05 00:09:23 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-05 00:09:23 +0000 |
| commit | 2f02cecb2ca7ae76e67d3de181b6e2589b253153 (patch) | |
| tree | ed70c3c657aaa132161afd3a7906ad5bde8605c5 /mk | |
| parent | bc6321a5e234155291da1143fa7c871cf0f7f795 (diff) | |
| download | pkgsrc-2f02cecb2ca7ae76e67d3de181b6e2589b253153.tar.gz | |
Factor out the pattern representing Makefiles into its own variable
MAKEFILE_PATTERNS. Also replace -R${BUILDLINK_DIR}/lib with
-R${LOCALBASE}/lib on all the REPLACE_BUILDLINK files to prevent rpath
references to ${BUILDLINK_DIR} from getting into things like config
scripts.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.buildlink.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mk/bsd.buildlink.mk b/mk/bsd.buildlink.mk index 1c97a3b7a51..604460b024b 100644 --- a/mk/bsd.buildlink.mk +++ b/mk/bsd.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink.mk,v 1.35 2001/10/04 03:29:08 jlam Exp $ +# $NetBSD: bsd.buildlink.mk,v 1.36 2001/10/05 00:09:23 jlam Exp $ # # This Makefile fragment is included by package buildlink.mk files. This # file does the following things: @@ -239,10 +239,12 @@ _REPLACE_LIBNAMES_SCRIPT= \ fi; \ fi +MAKEFILE_PATTERNS+= Makefile +MAKEFILE_PATTERNS+= Makeconf +MAKEFILE_PATTERNS+= *.mk + .if (${OBJECT_FMT} == "a.out") -REPLACE_LIBNAME_PATTERNS+= Makefile -REPLACE_LIBNAME_PATTERNS+= Makeconf -REPLACE_LIBNAME_PATTERNS+= *.mk +REPLACE_LIBNAME_PATTERNS+= ${MAKEFILE_PATTERNS} REPLACE_LIBNAME_PATTERNS_FIND= \ ${REPLACE_LIBNAME_PATTERNS:S/$/!/:S/^/-or -name !/:S/!/"/g:S/-or//1} @@ -250,7 +252,7 @@ REPLACE_LIBNAMES+= \ `cd ${WRKSRC}; ${FIND} . ${REPLACE_LIBNAME_PATTERNS_FIND} | ${SED} -e 's|^\./||' | ${SORT}` .endif -.if defined(REPLACE_LIBNAMES) +.if defined(REPLACE_LIBNAMES) || defined(REPLACE_LIBNAME_PATTERNS) .if defined(HAS_CONFIGURE) || defined(GNU_CONFIGURE) pre-configure: replace-libnames-configure @@ -295,7 +297,8 @@ post-build: replace-buildlink REPLACE_BUILDLINK_SED?= # empty REPLACE_BUILDLINK_POST_SED+= \ -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \ - -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" + -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \ + -e "s|-R${BUILDLINK_DIR}/|-R${LOCALBASE}/|g" # Fix files by removing buildlink directory references and library names. replace-buildlink: |