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....).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@159941 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index f9655964813f9ffc0df271d09c6ced5a485b0efb..d75b567cc599a79d5a1ab1a596e0dbc620e25302 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,11 +74,12 @@ install-conf:
                        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 ; \