From 80f9441bb4fe7b0861ac4f31074944d9d1c5b886 Mon Sep 17 00:00:00 2001 From: PHO Date: Tue, 5 Jan 2010 17:17:09 +0900 Subject: [PATCH] fixed broken Makefile --- Makefile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index e0e6201..ddf834e 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,6 @@ CONFIGURE_ENV+= PerlCmd=${PERL5:Q} # We don't want to extract all of the DISTFILEs. EXTRACT_ONLY= ${DISTNAME}-src.tar.bz2 -<<<<<<< Makefile PLATFORM= ${LOWER_ARCH}-unknown-${LOWER_OPSYS} CONFIGURE_ARGS += \ --build=${PLATFORM} \ @@ -57,15 +56,6 @@ CONFIGURE_ARGS += \ --with-gmp-libraries=${PREFIX}/lib \ --with-iconv-includes=${PREFIX}/include \ --with-iconv-libraries=${PREFIX}/lib -======= -CONFIGURE_ARGS += \ - --prefix=${PREFIX} \ - --mandir=${PREFIX}/${PKGMANDIR} \ - --with-gmp-includes=${PREFIX}/include \ - --with-gmp-libraries=${PREFIX}/lib \ - --with-iconv-includes=${PREFIX}/include \ - --with-iconv-libraries=${PREFIX}/lib ->>>>>>> 1.14 # Build an unregisterised bootstrap compiler and install it directly # into the .buildlink directory. But we can't use "make install" @@ -100,14 +90,14 @@ pre-configure: cd bootstrap/${DISTNAME} && \ ${LN} -sf ${PWD_CMD} utils/ghc-pwd/ghc-pwd && \ ${ECHO} "====> Configuring for bootstrap compiler" && \ - ${ENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot ${CONFIGURE_ARGS} && \ + ${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot ${CONFIGURE_ARGS} && \ ${ECHO} "====> Extracting bootstrap HC archive" && \ (cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \ ${SH} mkfiles && \ ${ECHO} "====> Building bootstrap compiler" && \ ${SED} -e "s#\\[\\[PREFIX\\]\\]#${PREFIX}#g" ${BOOTSTRAP_BUILD_MK} > mk/build.mk && \ for c in libraries/*/configure; do \ - (cd `${DIRNAME} $$c` && ${ENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \ + (cd `${DIRNAME} $$c` && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \ done && \ for i in inplace/lib/package.conf.d/*.conf */*/package-data.mk */*/*/package-data.mk; do \ ${SED} -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" $$i > $$i.tmp; \ @@ -127,7 +117,7 @@ pre-configure: # link programs by executing ld(1) without passing it -L${PREFIX}/lib. do-configure: ${RUN} cd ${WRKSRC} && \ - ${ENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} + ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} ${RUN} ${ECHO} "libraries/integer-gmp_CONFIGURE_OPTS += \ --configure-option=--with-gmp-includes=${PREFIX}/include \ --configure-option=--with-gmp-libraries=${PREFIX}/lib" > ${WRKSRC}/mk/build.mk -- 2.40.0