From 4baf4590ae335f8b3787d4e73aed59992cdf3426 Mon Sep 17 00:00:00 2001
From: Thomas Bushnell <thomas@gnu.org>
Date: Thu, 19 Sep 1996 21:09:37 +0000
Subject: *** empty log message ***

---
 config/ChangeLog | 15 +++++++++++++++
 config/Makefile  | 21 +++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'config')

diff --git a/config/ChangeLog b/config/ChangeLog
index ce3ab90a..ddce8693 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,18 @@
+Thu Sep 19 16:56:52 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* Makefile (install): Depend on installation directories directly;
+	don't make installed files depend on the directory.
+
+Tue Sep 17 16:29:40 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* Makefile ($(installed_logins), $(installed_rootdots),
+ 	$(installed_conf): Depend on FORCE instead of /dev/null.
+	(foo): Deleted target.
+	(LINKEDCONFFILES, installed_links): Deleted vars.
+	($(sysconfdir)/rc): Deleted target.
+	($(installed_links)): Deleted target.
+	(install): Don't depend on $(installed_links).
+
 Tue Sep 10 13:53:31 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
 	* Makefile ($(installed_conf)): Depend on $(sysconfdir).
diff --git a/config/Makefile b/config/Makefile
index 536521db..af5c5abe 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -35,31 +35,22 @@ installed_logins = $(addprefix $(sysconfdir)/login/,$(LOGINDOTS))
 ROOTDOTS = .bash_login .bashrc .profile
 installed_rootdots = $(addprefix $(prefix)/root/,$(ROOTDOTS))
 
-# Mere symlinks are installed for these
-LINKEDCONFFILES = rc
-installed_links = $(addprefix $(sysconfdir)/,$(LINKEDCONFFILES))
-
 DIST_FILES=$(SYSCONFFILES) \
 	$(addprefix login-,$(LOGINDOTS)) \
 	$(addprefix root-,$(ROOTDOTS))
 
-foo=$(shell touch /dev/null)
+FORCE:
 
 ifeq ($(override_conf),t)
-$(installed_rootdots): /dev/null
-$(installed_conf): /dev/null
+$(installed_rootdots): FORCE
+$(installed_conf): FORCE
 endif
 
-$(installed_logins): /dev/null
+$(installed_logins): FORCE
 
 include ../Makeconf
 
-install: $(installed_conf) $(installed_links) $(installed_logins) \
-	$(installed_rootdots)
-
-$(installed_rootdots): $(prefix)/root
-$(installed_logins): $(sysconfdir)/login
-$(installed_links) $(installed_conf): $(sysconfdir)
+install: $(prefix)/root $(sysconfdir) $(sysconfdir/login $(installed_conf) $(installed_logins) $(installed_rootdots)
 
 $(prefix)/root $(sysconfdir)/login: %:
 	mkdir -p $@
@@ -73,5 +64,3 @@ $(installed_logins): $(sysconfdir)/login/%: login-%
 $(installed_conf): $(sysconfdir)/%: %
 	$(INSTALL_DATA) $< $(sysconfdir)/$*
 
-$(sysconfdir)/rc:
-	ln -s ../libexec/rc $(sysconfdir)/rc
-- 
cgit v1.2.3