diff options
| author | obache <obache@pkgsrc.org> | 2014-02-03 09:48:44 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-02-03 09:48:44 +0000 |
| commit | f6d949ea3aff39919a28e727c77b569a8d41d5ff (patch) | |
| tree | 5a586facec74a04ef492f3b9a76b04426a32be06 /lang/ghc7 | |
| parent | 0fe2ed46f868eda192a8cc38d5acedfe7d287f5f (diff) | |
| download | pkgsrc-f6d949ea3aff39919a28e727c77b569a8d41d5ff.tar.gz | |
tell incdir of ncurses from pkgsrc to bootstrap.
Diffstat (limited to 'lang/ghc7')
| -rw-r--r-- | lang/ghc7/bootstrap.mk | 6 | ||||
| -rw-r--r-- | lang/ghc7/files/bootstrap.build.mk | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lang/ghc7/bootstrap.mk b/lang/ghc7/bootstrap.mk index cd8c7400e80..48ed11ec922 100644 --- a/lang/ghc7/bootstrap.mk +++ b/lang/ghc7/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.6 2014/02/03 07:06:55 obache Exp $ +# $NetBSD: bootstrap.mk,v 1.7 2014/02/03 09:48:44 obache Exp $ # ----------------------------------------------------------------------------- # Select a bindist of bootstrapping compiler based on a per-platform # basis. @@ -116,7 +116,9 @@ ${WRKDIR}/stamp-configure-boot: ${WRKDIR}/stamp-lndir-boot CONF_GCC_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \ CONF_LD_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \ ${SH} ./configure && \ - ${SED} -e "s,@CURSES_PREFIX@,${BUILDLINK_PREFIX.curses:Q},g" /${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk + ${SED} -e "s,@CURSES_INCDIR@,${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.ncurses:Uinclude},g" \ + -e "s,@CURSES_LIBDIR@,${BUILDLINK_PREFIX.curses:Q}/lib,g" \ + ${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk ${TOUCH} ${.TARGET} ${WRKDIR}/stamp-build-boot: ${WRKDIR}/stamp-configure-boot diff --git a/lang/ghc7/files/bootstrap.build.mk b/lang/ghc7/files/bootstrap.build.mk index 70c23b3ae8d..ef8e1c3735d 100644 --- a/lang/ghc7/files/bootstrap.build.mk +++ b/lang/ghc7/files/bootstrap.build.mk @@ -31,5 +31,5 @@ INTEGER_LIBRARY = integer-simple BIN_DIST_NAME = ghc-$(ProjectVersion)-boot libraries/terminfo_CONFIGURE_OPTS += \ - --configure-option=--with-curses-includes=@CURSES_PREFIX@/include \ - --configure-option=--with-curses-libraries=@CURSES_PREFIX@/lib + --configure-option=--with-curses-includes=@CURSES_INCDIR@ \ + --configure-option=--with-curses-libraries=@CURSES_LIBDIR@ |