diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /config/Makefile | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'config/Makefile')
| -rw-r--r-- | config/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/Makefile b/config/Makefile index 2cdcd818..00501598 100644 --- a/config/Makefile +++ b/config/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2004, 2012 Free Software Foundation, Inc. # Written by Michael I. Bushnell, p/BSG. # # This file is part of the GNU Hurd. @@ -32,8 +31,6 @@ installed_conf = $(addprefix $(sysconfdir)/,$(SYSCONFFILES)) LOGINDOTS = .bash_login .bashrc .hushlogin .profile README installed_logins = $(addprefix $(sysconfdir)/login/,$(LOGINDOTS)) -DIST_FILES=$(SYSCONFFILES) $(addprefix login-,$(LOGINDOTS)) - FORCE: ifeq ($(override_conf),t) |