From: Kimmo Suominen <kimmo@suominen.com>
Date: Tue, 1 Aug 2000 14:55:53 +0000 (+0000)
Subject: Make "make install" work in etc/Makefile.in
X-Git-Tag: RELEASE_1_2~211
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=20e97363e4c0e84b3744f3642e7d350fa8916e32;hp=da12435096e47ec1d362215141fc8b21f24e5e01

Make "make install" work in etc/Makefile.in
---

diff --git a/ChangeLog b/ChangeLog
index 2fd1854..1adac4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug  1 10:48:05 EDT 2000 Kimmo Suominen <kim@tac.nyc.ny.us>
+
+	* Fixed install in etc/Makefile.in so it works correctly.
+	Generated files cannot be installed from source directories.
+
 Mon Jul 24 16:20:45 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
 
 	* When Shantonu wrote the new, more portable dtimep.lex, he left
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 1801d68..d50fcf7 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -54,12 +54,6 @@ GENERATED_BIN_FILES = sendfiles
 # non-scripts generated using above GENERATED_FILE_SRCs
 GENERATED_ETC_FILES = mhn.defaults mts.conf
 
-# scripts we need to install (in bin)
-INSTALL_BIN_FILES = $(GENERATED_BIN_FILES)
-
-# non-scripts we need to install (in etc)
-INSTALL_ETC_FILES = $(STATIC_FILES) $(GENERATED_ETC_FILES)
-
 # auxiliary files (included in distribution but not installed)
 AUX = Makefile.in
 
@@ -90,17 +84,22 @@ install: install-bin-files install-etc-files
 
 install-bin-files:
 	$(top_srcdir)/mkinstalldirs $(bindir)
-	for script in $(INSTALL_BIN_FILES); do \
-	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
+	for script in $(GENERATED_BIN_FILES); do \
+	  $(INSTALL_PROGRAM) $$script $(bindir)/$$script; \
 	done
 
 install-etc-files:
 	$(top_srcdir)/mkinstalldirs $(etcdir)
-	for file in $(INSTALL_ETC_FILES); do \
+	INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
+	for file in $(STATIC_FILES); do \
+	  INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
+	done; \
+	for path in $$INSTALL_FILES; do \
+	  file=`basename $$path`; \
 	  echo "Installing $$file..."; \
 	  if [ -f $(etcdir)/$$file ]; then \
 	    mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
+	    $(INSTALL_DATA) $$path $(etcdir)/$$file; \
 	    if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
 	      rm $(etcdir)/$$file.prev; \
 	    else \
@@ -112,19 +111,19 @@ install-etc-files:
 	      echo; \
 	    fi; \
 	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
+	    $(INSTALL_DATA) $$path $(etcdir)/$$file; \
 	  fi; \
 	done
 
 uninstall: uninstall-bin-files uninstall-etc-files
 
 uninstall-bin-files:
-	for script in $(INSTALL_BIN_FILES); do \
+	for script in $(GENERATED_BIN_FILES); do \
 	  rm -f $(bindir)/$$script; \
 	done
 
 uninstall-etc-files:
-	for file in $(INSTALL_ETC_FILES); do \
+	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
 	  rm -f $(etcdir)/$$file; \
 	done