diff options
| author | jlam <jlam> | 2002-09-20 19:51:53 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-09-20 19:51:53 +0000 |
| commit | bb2556183d3c0f88fde0dcd2cdd813f45118b4f0 (patch) | |
| tree | 77a0384bd0458997293b9fc2bc7c0ba95326adb3 /www/apache2 | |
| parent | 5fef07b34dc52ea23caeee24aa2fd358ee669f7d (diff) | |
| download | pkgsrc-bb2556183d3c0f88fde0dcd2cdd813f45118b4f0.tar.gz | |
* shlibtool is not there, so don't LIBTOOL_OVERRIDE it
* Copy the real libtool, not the libtool buildlink2 wrapper, to
${PREFIX}/share/httpd/build. This fixes pkg/18349 by YAMAMOTO Takashi
<yamt@mwd.biglobe.ne.jp>.
Diffstat (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index a83883a023d..b0106c159d7 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/09/19 09:04:29 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/09/20 19:51:53 jlam Exp $ DISTNAME= httpd-${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} @@ -22,8 +22,7 @@ USE_BUILDLINK2= YES USE_GMAKE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/shlibtool -LIBTOOL_OVERRIDE+= ${WRKSRC}/srclib/apr/libtool +LIBTOOL_OVERRIDE= ${WRKSRC}/srclib/apr/libtool GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-layout=NetBSD @@ -124,6 +123,8 @@ AP_CONF_FILE_SED+= -e "s|^\(User[ ]\).*|\1${APACHE_USER}|g" AP_CONF_FILE_SED+= -e "s|^\(Group[ ]\).*|\1${APACHE_GROUP}|g" post-install: + ${RM} ${PREFIX}/share/httpd/build/libtool + ${INSTALL_SCRIPT} ${LIBTOOL} ${PREFIX}/share/httpd/build/libtool @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}" @cd ${EGDIR}; \ |