summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1999-05-30 01:47:35 +0000
committerRoland McGrath <roland@gnu.org>1999-05-30 01:47:35 +0000
commite52c1557d3421e0ec51c13aa6bbe10a2853fafae (patch)
tree87defe20fee3832e25f2f81b0984fb55bd77e260
parent70820b4a330aee61a691797bfca51482ae1a0bc8 (diff)
1999-05-24 Roland McGrath <roland@baalperazim.frob.com>
* protocols, services, shells, passwd, group, resolv.conf, fstab, root-.bash_login, root-.bashrc, root-.profile: Files removed. These files are not really Hurd-specific, and so should be installed by some other package (and are in Debian). * Makefile (SYSCONFFILES): Remove those files from the list. (ROOTDOTS, installed_rootdots): Variables removed. (DIST_FILES): Remove reference to $(ROOTDOTS). (install): Remove dep on $(installed_rootdots). ($(installed_rootdots)): Rule removed.
-rw-r--r--config/Makefile20
1 files changed, 6 insertions, 14 deletions
diff --git a/config/Makefile b/config/Makefile
index 3bcfde45..570939da 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -25,24 +25,18 @@ makemode := misc
# to overwrite an existing file. Print a warning for such files.
# If override_conf is set to `t' then install even on top of existing
# files.
-SYSCONFFILES = protocols services shells motd ttys fstab passwd \
- group resolv.conf
+SYSCONFFILES = motd ttys
+
installed_conf = $(addprefix $(sysconfdir)/,$(SYSCONFFILES))
LOGINDOTS = .bash_login .bashrc .hushlogin .profile README
installed_logins = $(addprefix $(sysconfdir)/login/,$(LOGINDOTS))
-ROOTDOTS = .bash_login .bashrc .profile
-installed_rootdots = $(addprefix $(prefix)/root/,$(ROOTDOTS))
-
-DIST_FILES=$(SYSCONFFILES) \
- $(addprefix login-,$(LOGINDOTS)) \
- $(addprefix root-,$(ROOTDOTS))
+DIST_FILES=$(SYSCONFFILES) $(addprefix login-,$(LOGINDOTS))
FORCE:
ifeq ($(override_conf),t)
-$(installed_rootdots): FORCE
$(installed_conf): FORCE
endif
@@ -50,14 +44,12 @@ $(installed_logins): FORCE
include ../Makeconf
-install: $(prefix)/root $(sysconfdir) $(sysconfdir)/login $(installed_conf) $(installed_logins) $(installed_rootdots)
+install: $(sysconfdir) $(sysconfdir)/login \
+ $(installed_conf) $(installed_logins)
-$(prefix)/root $(sysconfdir)/login: %:
+$(sysconfdir)/login: %:
mkdir -p $@
-$(installed_rootdots): $(prefix)/root/%: root-%
- $(INSTALL_DATA) $< $(prefix)/root/$*
-
$(installed_logins): $(sysconfdir)/login/%: login-%
$(INSTALL_DATA) $< $(sysconfdir)/login/$*