You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2005/04/03 19:50:14 UTC
svn commit: r159941 - httpd/httpd/branches/simple-conf/Makefile.in
Author: slive
Date: Sun Apr 3 10:50:14 2005
New Revision: 159941
URL: http://svn.apache.org/viewcvs?view=rev&rev=159941
Log:
The last commit messed up the case where we change
the config file name based on the executable name
(which doesn't seem like such a good idea in the
first case, but anyway....).
Modified:
httpd/httpd/branches/simple-conf/Makefile.in
Modified: httpd/httpd/branches/simple-conf/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/Makefile.in?view=diff&r1=159940&r2=159941
==============================================================================
--- httpd/httpd/branches/simple-conf/Makefile.in (original)
+++ httpd/httpd/branches/simple-conf/Makefile.in Sun Apr 3 10:50:14 2005
@@ -74,11 +74,12 @@
fi \
) > $(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 ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$i; \
+ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
fi; \
done ; \
done ; \