diff options
Diffstat (limited to 'lang/gcc/Makefile')
| -rw-r--r-- | lang/gcc/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 71913421c596..578cc082b42c 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.2.0 -PORTREVISION= 20060701 +PORTREVISION= 20060708 CATEGORIES= lang java VERSIONSTRING= 4.2-${PORTREVISION} MASTER_SITES= ${MASTER_SITE_GCC} @@ -56,7 +56,7 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build -TARGLIB= ${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION} +TARGLIB= ${PREFIX}/lib/gcc-${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-nls \ --with-system-zlib \ @@ -65,7 +65,6 @@ CONFIGURE_ARGS+= --disable-nls \ --libdir=${TARGLIB} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ \ --infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX} -CONFIGURE_ENV= RANLIB=: .if defined(WITH_JAVA_AWT) CONFIGURE_ARGS+= --enable-java-awt=xlib,gtk .endif @@ -160,15 +159,13 @@ post-install: ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib -.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax +.for d in ${TARGLIB:S/^${PREFIX}\///} libexec/gcc/${CONFIGURE_TARGET}/${PORTVERSION} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ ${FIND} $d -type d | ${SORT} -r \ | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST} |