summaryrefslogtreecommitdiff
path: root/www/apache21/files/patch-Makefile.in
diff options
context:
space:
mode:
authorYing-Chieh Liao <ijliao@FreeBSD.org>2002-04-18 20:29:41 +0000
committerYing-Chieh Liao <ijliao@FreeBSD.org>2002-04-18 20:29:41 +0000
commita7fe341967a9b6a7d94feb12765b74f343905ad4 (patch)
treee657c5991a80a7c090d5d8e21574355994aed11c /www/apache21/files/patch-Makefile.in
parentUpdate to 0.2.1 (diff)
Respect $DESTDIR for all paths
PR: 37211 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=57866
Diffstat (limited to 'www/apache21/files/patch-Makefile.in')
-rw-r--r--www/apache21/files/patch-Makefile.in23
1 files changed, 18 insertions, 5 deletions
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
index 6e19ed4299c9..5c784ddc3807 100644
--- a/www/apache21/files/patch-Makefile.in
+++ b/www/apache21/files/patch-Makefile.in
@@ -1,6 +1,6 @@
--- Makefile.in.orig Sat Apr 6 04:36:06 2002
-+++ Makefile.in Sun Apr 7 08:26:45 2002
-@@ -33,12 +33,15 @@
++++ Makefile.in Thu Apr 18 09:22:29 2002
+@@ -33,23 +33,28 @@
@test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
@cd $(top_srcdir)/docs/conf; \
for i in mime.types magic; do \
@@ -17,7 +17,20 @@
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
-@@ -57,7 +60,7 @@
+ sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+ -e 's#@@Port@@#$(PORT)#g' \
++ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
+ -e '/@@LoadModule@@/d' \
+ < $$i; \
+ else \
+ sed -n -e '/@@LoadModule@@/q' \
+ -e 's#@@ServerRoot@@#$(prefix)#g' \
+ -e 's#@@Port@@#$(PORT)#g' \
++ -e 's#@@DESTDIR@@#$(DESTDIR)#g' \
+ -e 'p' \
+ < $$i; \
+ for j in $(DSO_MODULES) "^EOL^"; do \
+@@ -57,7 +62,7 @@
echo "<IfDefine SSL>"; \
fi; \
if test $$j != "^EOL^"; then \
@@ -26,7 +39,7 @@
fi; \
if test "x$$j" = "xssl"; then \
echo "</IfDefine>"; \
-@@ -106,11 +109,14 @@
+@@ -106,11 +111,14 @@
install-htdocs:
@echo Installing HTML documents
@@ -44,7 +57,7 @@
install-error:
@echo Installing error documents
-@@ -126,9 +132,10 @@
+@@ -126,9 +134,10 @@
install-cgi:
@echo Installing CGIs