10d98a6ab0
define prefix the way apache likes it. this is because apache2 has a different understanding of what the prefix means, and our understanding and application of it on this port leads to extremely confused paths in a lot of its generated files. our understanding of prefix is to mean the path at which the binaries, libs, manpages, and so on are stored, ie, /usr/local. apache2 understands prefix to mean "install architecture-independent files", or in real terms the ServerRoot. obviously using /usr/local as the server root when we want to use /var/apache2 for that purpose is uncomfortable for it, and it leads to things like broken paths in the default config files and builds of modules. ok robert@
30 lines
1.1 KiB
Plaintext
30 lines
1.1 KiB
Plaintext
$OpenBSD: patch-Makefile_in,v 1.4 2007/01/09 09:56:57 dlg Exp $
|
|
--- Makefile.in.orig Sun Nov 13 16:33:15 2005
|
|
+++ Makefile.in Mon Jan 8 20:30:37 2007
|
|
@@ -47,12 +47,16 @@ install-conf:
|
|
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
|
|
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
|
|
-e 's#@@Port@@#$(PORT)#g' \
|
|
+ -e 's#@@User@@#$(rel_user)#g' \
|
|
+ -e 's#@@Group@@#$(rel_group)#g' \
|
|
-e '/@@LoadModule@@/d' \
|
|
< $$i; \
|
|
else \
|
|
sed -n -e '/@@LoadModule@@/q' \
|
|
-e 's#@@ServerRoot@@#$(prefix)#g' \
|
|
-e 's#@@Port@@#$(PORT)#g' \
|
|
+ -e 's#@@User@@#$(rel_user)#g' \
|
|
+ -e 's#@@Group@@#$(rel_group)#g' \
|
|
-e 'p' \
|
|
< $$i; \
|
|
for j in $(DSO_MODULES) "^EOL^"; do \
|
|
@@ -64,6 +68,8 @@ install-conf:
|
|
-e '/@@LoadModule@@/d' \
|
|
-e 's#@@ServerRoot@@#$(prefix)#g' \
|
|
-e 's#@@Port@@#$(PORT)#g' \
|
|
+ -e 's#@@User@@#$(rel_user)#g' \
|
|
+ -e 's#@@Group@@#$(rel_group)#g' \
|
|
< $$i; \
|
|
fi \
|
|
) > $(DESTDIR)$(sysconfdir)/original/$$i; \
|