copy rules now require a TARGET var, to specify the tar...

Author: doogie
Date: 2003-02-12 07:28:33 GMT
copy rules now require a TARGET var, to specify the target to install the
copy rules under.  The copy target in dselect/makefile installs itself
under program, and not doc.

diff --git a/buildlib/copy.mak b/buildlib/copy.mak
index 892b74bc4e5d003fe4905470b7e2c6cbfaa68257..15f448827b3e7915f34a2204313de0a56e723ecb 100644 (file)
--- a/buildlib/copy.mak
+++ b/buildlib/copy.mak
@@ -5,6 +5,8 @@
 # Input
 # $(SOURCE) - The documents to use
 # $(TO)     - The directory to put them in
+# $(TARGET) - The global target to add the local target as a dependency
+#             to.
 # All output is writtin to files in the build/$(TO) directory
 
 # See defaults.mak for information about LOCAL
@@ -14,7 +16,7 @@ LOCAL := copy-$(firstword $(SOURCE))
 $(LOCAL)-LIST := $(addprefix $(TO)/,$(SOURCE))
 
 # Install generation hooks
-doc: $($(LOCAL)-LIST)
+$(TARGET): $($(LOCAL)-LIST)
 veryclean: veryclean/$(LOCAL)
 
 MKDIRS += $(dir $($(LOCAL)-LIST))

diff --git a/doc/makefile b/doc/makefile
index 2ea37eae78005fadab341471efd98d9f3a988fde..6fef0cc6eeb2dfa3f4b49cf7db8e2138af07e007 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -20,4 +20,5 @@ include $(SGML_MANPAGE_H)
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index 
 TO = $(DOC)
+TARGET = doc
 include $(COPY_H)

diff --git a/dselect/makefile b/dselect/makefile
index cdc802864f49c0a2af9cc9c08d35646a7539b70e..c2059f92ac1b4d58af32473fef67e5682979cc2b 100644 (file)
--- a/dselect/makefile
+++ b/dselect/makefile
@@ -8,6 +8,7 @@ include ../buildlib/defaults.mak
 # DSelect interfacing directory
 SOURCE = desc.apt install names setup update
 TO = $(BUILD)/scripts/dselect
+TARGET = program
 include $(COPY_H)
 
 LOCAL = dselect