diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2005-09-01 14:26:39 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2005-09-01 14:26:39 +0000 |
| commit | c26ee9220acb30290ee54e935b772e89d85db297 (patch) | |
| tree | 0c5bdf927467d2d9aca0f5e766d6ed6a19b5cde1 /www/resin3 | |
| parent | Update to 4.5.0.1 (diff) | |
Install mod_caucho.so during 'install' target rather than 'build' target. This
will fix an error I introduced with my last commit.
PR: 85460
Reported by: Boris Kovalenko <boris@tagnet.ru>
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=141710
Diffstat (limited to 'www/resin3')
| -rw-r--r-- | www/resin3/Makefile | 6 | ||||
| -rw-r--r-- | www/resin3/files/patch-apache1-Makefile.in | 18 | ||||
| -rw-r--r-- | www/resin3/files/patch-apache2-Makefile.in | 18 |
3 files changed, 24 insertions, 18 deletions
diff --git a/www/resin3/Makefile b/www/resin3/Makefile index 9e66f1faa3cd..db8ea5f553f1 100644 --- a/www/resin3/Makefile +++ b/www/resin3/Makefile @@ -132,6 +132,12 @@ post-build: do-install: @${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh +.if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES)) + ${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so +.endif +.if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) + ${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache1/.libs/mod_caucho.so +.endif @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_MSG} @${ECHO_MSG} "********************************************************************************" diff --git a/www/resin3/files/patch-apache1-Makefile.in b/www/resin3/files/patch-apache1-Makefile.in index 4a5992dfc236..62f25a99a40e 100644 --- a/www/resin3/files/patch-apache1-Makefile.in +++ b/www/resin3/files/patch-apache1-Makefile.in @@ -1,14 +1,14 @@ -$FreeBSD$ - ---- modules/c/src/apache1/Makefile.in.orig Mon Oct 11 11:34:53 2004 -+++ modules/c/src/apache1/Makefile.in Mon Oct 11 12:44:59 2004 -@@ -38,8 +38,7 @@ - $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec) - - rm -f $(apache_libexec)/mod_caucho.la - - rm -f $(apache_libexec)/mod_caucho.a +--- modules/c/src/apache1/Makefile.in.orig Sat Mar 5 22:18:38 2005 ++++ modules/c/src/apache1/Makefile.in Thu Sep 1 12:44:50 2005 +@@ -35,11 +35,6 @@ + $(CC) -c $(INCLUDES) $(CFLAGS) $< + + install : mod_caucho.la +- $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec) +- - rm -f $(apache_libexec)/mod_caucho.la +- - rm -f $(apache_libexec)/mod_caucho.a - sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \ - -resin_home $(resin_home) -+ %%APXS%% -e -a -n caucho mod_caucho.so clean : - rm *.o *.lo *.la *.so .libs diff --git a/www/resin3/files/patch-apache2-Makefile.in b/www/resin3/files/patch-apache2-Makefile.in index aa6c2b38f528..18e61ce08c35 100644 --- a/www/resin3/files/patch-apache2-Makefile.in +++ b/www/resin3/files/patch-apache2-Makefile.in @@ -1,14 +1,14 @@ -$FreeBSD$ - ---- modules/c/src/apache2/Makefile.in.orig Mon Oct 11 11:34:53 2004 -+++ modules/c/src/apache2/Makefile.in Mon Oct 11 12:44:59 2004 -@@ -38,8 +38,7 @@ - $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec) - - rm -f $(apache_libexec)/mod_caucho.la - - rm -f $(apache_libexec)/mod_caucho.a +--- modules/c/src/apache2/Makefile.in.orig Thu Sep 1 12:32:43 2005 ++++ modules/c/src/apache2/Makefile.in Thu Sep 1 12:32:49 2005 +@@ -35,11 +35,6 @@ + $(CC) -c $(INCLUDES) $(CFLAGS) $< + + install : mod_caucho.la +- $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec) +- - rm -f $(apache_libexec)/mod_caucho.la +- - rm -f $(apache_libexec)/mod_caucho.a - sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \ - -resin_home $(resin_home) -+ %%APXS%% -e -a -n caucho mod_caucho.so clean : - rm *.o *.lo *.la *.so .libs |