Re: rc & runsystem

[Alfred M. Szmidt]

   > -#   Copyright (C) 1996,99 Free Software Foundation, Inc.
   > +#   Copyright (C) 1996,99,04 Free Software Foundation, Inc.

   This copyright year it definitely wrong.

I use copyright-update to update copyright years in emacs, so I guess
that is a bug there.  Will fix it accordingly if the patch can go in.

But since Marco brought up this interesting "override_conf=t" hack, I
actually consider my patch wrong and object to it. :-) New patch
attached.  I only tested it lightly.

daemons/ChangeLog
2004-12-16  Alfred M. Szmidt  <ams@gnu.org>

        * Makefile (targets): Removed `rc' and `runsystem'.
        (special-targets): Variable removed.
        (runsystem, rc): Targets removed.
        (FORCE, $(libexecdir)/rc, $(libexecdir)/runsystem, install):
        New targets.

Index: daemons/Makefile
===================================================================
RCS file: /cvsroot/hurd/hurd/daemons/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- daemons/Makefile    18 Jun 1999 22:04:43 -0000      1.11
+++ daemons/Makefile    16 Dec 2004 21:44:13 -0000
@@ -1,6 +1,6 @@
 # Makefile for daemons
 #
-#   Copyright (C) 1996,99 Free Software Foundation, Inc.
+#   Copyright (C) 1996,99,2004 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -20,8 +20,7 @@
 dir := daemons
 makemode := utilities
 
-targets = rc getty mail.local console-run runttys runsystem
-special-targets = rc runsystem
+targets = getty mail.local console-run runttys
 SRCS = rc.sh getty.c lmail.c console-run.c runttys.c
 installationdir = $(libexecdir)
 
@@ -33,7 +32,6 @@
 
 include ../Makeconf
 
-rc: rc.sh
 getty: getty.o ../libshouldbeinlibc/libshouldbeinlibc.a
 mail.local: lmail.o ../libshouldbeinlibc/libshouldbeinlibc.a
 console-run: console-run.o ../libfshelp/libfshelp.a ../libports/libports.a
@@ -41,4 +39,17 @@
 runttys: runttys.o
 runttys-LDLIBS = -lutil
 
-runsystem: runsystem.sh
+FORCE:
+
+ifeq ($(override_conf),t)
+$(libexecdir)/rc: FORCE
+$(libexecdir)/runsystem: FORCE
+endif
+
+$(libexecdir)/rc: $(libexecdir)/%: rc.sh
+       $(INSTALL_DATA) $< $(libexecdir)/$*
+
+$(libexecdir)/runsystem: $(libexecdir)/%: runsystem.sh
+       $(INSTALL_DATA) $< $(libexecdir)/$*
+
+install: $(libexecdir)/rc $(libexecdir)/runsystem