You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2005/06/07 20:54:26 UTC
svn commit: r188844 - /httpd/httpd/trunk/Makefile.in
Author: jerenkrantz
Date: Tue Jun 7 11:54:25 2005
New Revision: 188844
URL: http://svn.apache.org/viewcvs?rev=188844&view=rev
Log:
* Makefile.in: Fix brokenness with VPATH builds as the .conf files do not exist
in srcdir and sh panics; also fix one whitespace issue.
Modified:
httpd/httpd/trunk/Makefile.in
Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.in?rev=188844&r1=188843&r2=188844&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Tue Jun 7 11:54:25 2005
@@ -48,6 +48,7 @@
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,12 +75,13 @@
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 ; \