diff options
| author | vs <vs@FreeBSD.org> | 2004-08-12 17:31:51 +0800 |
|---|---|---|
| committer | vs <vs@FreeBSD.org> | 2004-08-12 17:31:51 +0800 |
| commit | 3f5f815247fae42d330765d0061d01b36ff55eab (patch) | |
| tree | 790a9888fdb34d90a766529ca9f2cc595d46c8c9 /www/suphp/files | |
| parent | a9070220699d4c56339f4f4a5a61c68d63218dba (diff) | |
| download | freebsd-ports-gnome-3f5f815247fae42d330765d0061d01b36ff55eab.tar.gz freebsd-ports-gnome-3f5f815247fae42d330765d0061d01b36ff55eab.tar.zst freebsd-ports-gnome-3f5f815247fae42d330765d0061d01b36ff55eab.zip | |
- Fix "make -C"-issues
- Unregister from Apache through apxs on deinstall
- Cleanup
PR: ports/70345
Submitted by: Jeremy Chadwick (maintainer)
Diffstat (limited to 'www/suphp/files')
| -rw-r--r-- | www/suphp/files/patch-src::Makefile.in | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/www/suphp/files/patch-src::Makefile.in b/www/suphp/files/patch-src::Makefile.in index 4035be6302d0..804eebc2e4c2 100644 --- a/www/suphp/files/patch-src::Makefile.in +++ b/www/suphp/files/patch-src::Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Mon Aug 25 11:50:48 2003 -+++ src/Makefile.in Thu Jul 15 22:52:13 2004 -@@ -28,11 +28,13 @@ +--- src/Makefile.in.orig Tue Jul 13 02:43:41 2004 ++++ src/Makefile.in Wed Aug 11 22:02:44 2004 +@@ -28,37 +28,38 @@ INCLUDES = -I$(top_srcdir)/src RM = rm -f @@ -17,7 +17,18 @@ suphp.mod: @if test "$(APXS)" != "/notfound/"; then \ -@@ -49,7 +51,6 @@ + if test "$(APACHE_VERSION_2)" = "true"; then \ + echo "*** INFO: Building mod_suphp for Apache 2.0 ***"; \ +- $(MAKE) $(MAKEDEFS) -C apache2; \ ++ cd apache2 && $(MAKE) $(MAKEDEFS); \ + fi; \ + if test "$(APACHE_VERSION_1_3)" = "true"; then \ + echo "*** INFO: Building mod_suphp for Apache 1.3 ***"; \ +- $(MAKE) $(MAKEDEFS) -C apache; \ ++ cd apache && $(MAKE) $(MAKEDEFS); \ + fi; \ + else \ + echo "*** WARNING: No 'apxs' found. Skipping mod_suphp! ***"; \ fi install: suphp suphp.mod @@ -25,9 +36,25 @@ $(INSTALL_PROGRAM) -m 4755 suphp $(DESTDIR)$(sbindir)/suphp @if test "$(APXS)" != "/notfound/"; then \ if test "$(APACHE_VERSION_2)" = "true"; then \ -@@ -69,6 +70,6 @@ - @$(MAKE) $(MAKEDEFS) -C apache clean - @$(MAKE) $(MAKEDEFS) -C apache2 clean + echo "*** INFO: Installing mod_suphp for Apache 2.0 ***"; \ +- $(MAKE) $(MAKEDEFS) -C apache2 install; \ ++ cd apache2 && $(MAKE) $(MAKEDEFS) install; \ + fi; \ + if test "$(APACHE_VERSION_1_3)" = "true"; then \ + echo "*** INFO: Installing mod_suphp for Apache 1.3 ***"; \ +- $(MAKE) $(MAKEDEFS) -C apache install; \ ++ cd apache && $(MAKE) $(MAKEDEFS) install; \ + fi; \ + else \ + echo "*** WARNING: No 'apxs' found. Skipping installation of mod_suphp! ***"; \ +@@ -66,9 +67,9 @@ + + clean: + $(RM) suphp *.o +- @$(MAKE) $(MAKEDEFS) -C apache clean +- @$(MAKE) $(MAKEDEFS) -C apache2 clean ++ cd apache && $(MAKE) $(MAKEDEFS) clean ++ cd apache2 && $(MAKE) $(MAKEDEFS) clean -%.o : %.c +${OBJS}: ${SRCS} |