diff options
author | Brian Feldman <green@FreeBSD.org> | 2000-02-23 11:32:33 +0000 |
---|---|---|
committer | Brian Feldman <green@FreeBSD.org> | 2000-02-23 11:32:33 +0000 |
commit | f184f57567e318554b501fa3dda0da96cc64e991 (patch) | |
tree | de89e792856de1c3024d9ae4dd04dc4da1b6bb29 | |
parent | Change install -C usage to install -c usage, fixing the install for older (diff) |
Get all of the good parts of MAKE_ENV et al to the _second_ configure
in this port, which seems to unbreak it the rest of the way for 3.X
-STABLE installations.
Submitted by: Alexander N. Kabaev <ak03@gte.com>
Notes
Notes:
svn path=/head/; revision=26203
-rw-r--r-- | net-im/licq/Makefile | 14 | ||||
-rw-r--r-- | net/licq-devel/Makefile | 14 | ||||
-rw-r--r-- | net/licq/Makefile | 14 |
3 files changed, 39 insertions, 3 deletions
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index 85e353806cda..ac50adf9df0d 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -31,7 +31,19 @@ DATAFILES= ${DATANAME}${EXTRACT_SUFX} DATADIR= ${WRKDIR}/${DATANAME} post-configure: - @(cd ${WRKSRC}/plugins/qt-gui; ./configure --prefix=${PREFIX}) + @(cd ${WRKSRC}/plugins/qt-gui && \ + if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ + ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ + ${CAT} ${CONFIGURE_LOG}; \ + ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ + ${FALSE}; \ + fi) post-build: @(cd ${WRKSRC}/plugins/qt-gui;\ diff --git a/net/licq-devel/Makefile b/net/licq-devel/Makefile index 85e353806cda..ac50adf9df0d 100644 --- a/net/licq-devel/Makefile +++ b/net/licq-devel/Makefile @@ -31,7 +31,19 @@ DATAFILES= ${DATANAME}${EXTRACT_SUFX} DATADIR= ${WRKDIR}/${DATANAME} post-configure: - @(cd ${WRKSRC}/plugins/qt-gui; ./configure --prefix=${PREFIX}) + @(cd ${WRKSRC}/plugins/qt-gui && \ + if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ + ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ + ${CAT} ${CONFIGURE_LOG}; \ + ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ + ${FALSE}; \ + fi) post-build: @(cd ${WRKSRC}/plugins/qt-gui;\ diff --git a/net/licq/Makefile b/net/licq/Makefile index 85e353806cda..ac50adf9df0d 100644 --- a/net/licq/Makefile +++ b/net/licq/Makefile @@ -31,7 +31,19 @@ DATAFILES= ${DATANAME}${EXTRACT_SUFX} DATADIR= ${WRKDIR}/${DATANAME} post-configure: - @(cd ${WRKSRC}/plugins/qt-gui; ./configure --prefix=${PREFIX}) + @(cd ${WRKSRC}/plugins/qt-gui && \ + if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ + INSTALL_DATA="${INSTALL_DATA}" \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ + ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ + ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ + ${CAT} ${CONFIGURE_LOG}; \ + ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ + ${FALSE}; \ + fi) post-build: @(cd ${WRKSRC}/plugins/qt-gui;\ |