diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2005-06-07 18:54:25 +0000 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2005-06-07 18:54:25 +0000 |
| commit | 99cc1e829fac7319b7780bc05ee8668b8095ffad (patch) | |
| tree | ec917e364d882b1480438740726551f33f790b9b /Makefile.in | |
| parent | ac40284b851e5c4a56f192dc0e208b5276c95f98 (diff) | |
| download | httpd-99cc1e829fac7319b7780bc05ee8668b8095ffad.tar.gz | |
* Makefile.in: Fix brokenness with VPATH builds as the .conf files do not exist
in srcdir and sh panics; also fix one whitespace issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@188844 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 6d8348d9f4..d6cc4ef664 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,6 +48,7 @@ install-conf: for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ cd $$j ; \ for i in httpd.conf extra/httpd-*.conf; do \ + if [ -f $$i ] ; then \ ( \ 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 \ @@ -74,13 +75,14 @@ install-conf: fi \ ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ - file=$$i; \ + file=$$i; \ if [ "$$i" = "httpd.conf" ]; then \ file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ fi; \ if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \ fi; \ + fi; \ done ; \ done ; \ if test -f "$(builddir)/envvars-std"; then \ |