diff options
| author | jlam <jlam> | 2006-04-05 06:27:41 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-04-05 06:27:41 +0000 |
| commit | 5cc8e73b83b9309bf84af4a9d9cb7738404811bf (patch) | |
| tree | 9715e961e0768a329a3f48b11197783d3a0dc0d2 /lang/mercury | |
| parent | a593a681ca15329c6037265f4c79e18380f08b87 (diff) | |
| download | pkgsrc-5cc8e73b83b9309bf84af4a9d9cb7738404811bf.tar.gz | |
List the info files directly in the PLIST, and honor PKGINFODIR and
PKGMANDIR.
Diffstat (limited to 'lang/mercury')
| -rw-r--r-- | lang/mercury/Makefile | 23 | ||||
| -rw-r--r-- | lang/mercury/PLIST | 8 |
2 files changed, 20 insertions, 11 deletions
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile index 37373ed36c1..0cead074f31 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/03/04 21:29:55 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2006/04/05 06:27:41 jlam Exp $ DISTNAME= mercury-compiler-0.11.0 PKGNAME= mercury-0.11.0 @@ -14,10 +14,7 @@ COMMENT= Modern logic/functional programming language GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_GNU_READLINE= yes # rl_prep_term_function - -INFO_FILES= mercury.info mercury_faq.info mercury_library.info -INFO_FILES+= mercury_ref.info mercury_trans_guide.info -INFO_FILES+= mercury_user_guide.info +INFO_FILES= # PLIST # Some of the scripts test CC and use special settings for gcc. CONFIGURE_ENV+= CC=gcc @@ -27,6 +24,16 @@ USE_TOOLS+= hostname MAKE_ENV+= READLINE_PREFIX=${BUILDLINK_PREFIX.readline} +INSTALL_PREFIX= ${WRKSRC}/tmp +BUILD_MAKE_FLAGS= ${MAKE_FLAGS} +BUILD_MAKE_FLAGS+= INSTALL_PREFIX=${INSTALL_PREFIX:Q} +BUILD_MAKE_FLAGS+= INSTALL_INFO_DIR=${INSTALL_PREFIX:Q}/${PKGINFODIR:Q} +BUILD_MAKE_FLAGS+= INSTALL_MAN_DIR=${INSTALL_PREFIX:Q}/${PKGMANDIR:Q} +BUILD_MAKE_FLAGS+= MERCURY_COMPILER=${INSTALL_PREFIX:Q}/lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile + +.include "../../devel/readline/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" + post-patch: ${TOUCH} \ ${WRKSRC}/library/table_builtin.date3 \ @@ -37,9 +44,7 @@ post-patch: do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${MAKE} INSTALL_PREFIX=${WRKSRC}/tmp \ - MERCURY_COMPILER=${WRKSRC}/tmp/lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile \ - install + ${MAKE} ${BUILD_MAKE_FLAGS} install do-install: cd ${WRKSRC}/tmp && ${PAX} -rw . ${PREFIX} @@ -48,6 +53,4 @@ do-install: ${FIND} ${WRKSRC} -type f -name ".cvsignore" -print | ${XARGS} ${RM} -f cd ${WRKSRC}/samples && ${PAX} -rw . ${PREFIX}/share/examples/mercury -.include "../../devel/readline/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST index 4d36f4686a6..15adc62309d 100644 --- a/lang/mercury/PLIST +++ b/lang/mercury/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2005/04/05 11:17:04 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/04/05 06:27:41 jlam Exp $ bin/c2init bin/canonical_grade bin/info_to_mdb @@ -17,6 +17,12 @@ bin/mprof bin/mprof_merge_runs bin/mtags bin/vpath_find +info/mercury.info +info/mercury_faq.info +info/mercury_library.info +info/mercury_ref.info +info/mercury_trans_guide.info +info/mercury_user_guide.info lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_profile lib/mercury/inc/array.mh |