Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 89922 invoked from network); 7 Jun 2005 18:54:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Jun 2005 18:54:38 -0000 Received: (qmail 95387 invoked by uid 500); 7 Jun 2005 18:54:37 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 95275 invoked by uid 500); 7 Jun 2005 18:54:35 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 95215 invoked by uid 99); 7 Jun 2005 18:54:35 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 07 Jun 2005 11:54:34 -0700 Received: (qmail 89860 invoked by uid 65534); 7 Jun 2005 18:54:26 -0000 Message-ID: <20050607185426.89859.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r188844 - /httpd/httpd/trunk/Makefile.in Date: Tue, 07 Jun 2005 18:54:26 -0000 To: cvs@httpd.apache.org From: jerenkrantz@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jerenkrantz Date: Tue Jun 7 11:54:25 2005 New Revision: 188844 URL: http://svn.apache.org/viewcvs?rev=3D188844&view=3Drev Log: * Makefile.in: Fix brokenness with VPATH builds as the .conf files do not e= xist 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=3D1888= 44&r1=3D188843&r2=3D188844&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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=3D`awk 'BEGIN {n=3D0} /@@LoadModule@@/ {n+=3D1} END {print n}'= < $$i`; \ if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" =3D "x"; then \ @@ -74,12 +75,13 @@ fi \ ) > $(DESTDIR)$(sysconfdir)/original/$$i; \ chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \ - file=3D$$i; \ + file=3D$$i; \ if [ "$$i" =3D "httpd.conf" ]; then \ file=3D`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \ fi; \ if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sy= sconfdir)/$$file; \ + fi; \ fi; \ done ; \ done ; \