diff options
| author | jlam <jlam> | 2003-08-30 07:57:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-30 07:57:57 +0000 |
| commit | e811e11e4a7ad1e4c5376efe96133f567c71bccd (patch) | |
| tree | 007a6ffbc38ed830a55b94c0d14d67daad6eabaa | |
| parent | c00c960e96215586eea1ba47be30aaa3b6dc6003 (diff) | |
| download | pkgsrc-e811e11e4a7ad1e4c5376efe96133f567c71bccd.tar.gz | |
Sync to HEAD.
| -rw-r--r-- | mk/buildlink2/libtool-fix-la | 2 | ||||
| -rw-r--r-- | mk/tools.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la index a6d5eb3e7a6..29a82c68e75 100644 --- a/mk/buildlink2/libtool-fix-la +++ b/mk/buildlink2/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.18.6.1 2003/08/27 12:57:03 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.18.6.2 2003/08/30 07:57:58 jlam Exp $ # # For *.la files, in the "relink_command" line, we make the following # replacements: diff --git a/mk/tools.mk b/mk/tools.mk index bfb828e55bf..301a755d140 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.mk,v 1.4.2.7 2003/08/27 11:44:32 jlam Exp $ +# $NetBSD: tools.mk,v 1.4.2.8 2003/08/30 07:57:57 jlam Exp $ # # This Makefile creates a ${TOOLS_DIR} directory and populates the bin # subdir with tools that hide the ones outside of ${TOOLS_DIR}. @@ -224,7 +224,7 @@ _TOOLS_PROGNAME.make= ${GMAKE} .if (${_TOOLS_NEED_GNU.make} == "YES") && empty(PKGPATH:Mdevel/gmake) BUILD_DEPENDS+= gmake>=3.78:../../devel/gmake _TOOLS_OVERRIDE.make= YES -_TOOLS_PROGNAME.make= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}make +_TOOLS_PROGNAME.make= ${LOCALBASE}/bin/gmake # "gmake" always exists GMAKE:= ${_TOOLS_PROGNAME.make} .endif .if !empty(PKGPATH:Mdevel/gmake) |