diff options
| author | Joshua Slive <slive@apache.org> | 2005-04-09 16:59:15 +0000 |
|---|---|---|
| committer | Joshua Slive <slive@apache.org> | 2005-04-09 16:59:15 +0000 |
| commit | fa4e8666003806970b6ef033d8d867f7a1ec0d89 (patch) | |
| tree | c03851a209dd2d280d7061ac7770fecb900b9a1b /Makefile.in | |
| parent | d13b2de6e2e43932ae5ab74fc270961d205e011b (diff) | |
| download | httpd-fa4e8666003806970b6ef033d8d867f7a1ec0d89.tar.gz | |
Merged the simple-conf branch changes r159781:160695 into the trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 304745de94..d75b567cc5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,13 @@ install-conf: if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \ fi ; \ + if [ ! -d $(DESTDIR)$(sysconfdir)/extra ]; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/extra ; \ + fi ; \ + if [ ! -d $(DESTDIR)$(sysconfdir)/original ]; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original ; \ + $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra ; \ + fi ; \ cd $(top_srcdir)/docs/conf; \ for i in mime.types magic; do \ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ @@ -40,7 +47,7 @@ install-conf: done; \ for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ cd $$j ; \ - for i in *-std*.conf; do \ + for i in httpd.conf extra/httpd-*.conf; do \ ( \ 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 \ @@ -55,15 +62,9 @@ install-conf: -e 'p' \ < $$i; \ for j in $(DSO_MODULES) "^EOL^"; do \ - if test "x$$j" = "xssl"; then \ - echo "<IfDefine SSL>"; \ - fi; \ if test $$j != "^EOL^"; then \ echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ fi; \ - if test "x$$j" = "xssl"; then \ - echo "</IfDefine>"; \ - fi; \ done; \ sed -e '1,/@@LoadModule@@/d' \ -e '/@@LoadModule@@/d' \ @@ -71,14 +72,14 @@ install-conf: -e 's#@@Port@@#$(PORT)#g' \ < $$i; \ fi \ - ) > $(DESTDIR)$(sysconfdir)/$$i; \ - chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \ - file=`echo $$i|sed s/-std//`; \ - if [ "$$file" = "httpd.conf" ]; then \ - file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ + ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ + chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ + file=$$i; \ + if [ "$$i" = "httpd.conf" ]; then \ + file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ fi; \ - if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ - $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \ + if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ + $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ fi; \ done ; \ done ; \ |