X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-ghc.git;a=blobdiff_plain;f=Makefile;h=e0e6201fcb5d02b2a17d1c59fb7c5fc7a97ec2fa;hp=dbe893ed11387e7536a35466ff2a0170e7670b67;hb=50d1db4f9e9c59e5dd04a4a58aca83fb8c6d6cb9;hpb=5a8df27b0149257f8f25ed9c7397f5b466a59566

diff --git a/Makefile b/Makefile
index dbe893e..e0e6201 100644
--- a/Makefile
+++ b/Makefile
@@ -45,13 +45,27 @@ 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} \
+	--host=${PLATFORM} \
+	--target=${PLATFORM} \
 	--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
+=======
+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"