* header.am (install-@DIR@HEADERS): Use INSTALL_HEADER.

	* header-vars.am (INSTALL_HEADER): New macro.

diff --git a/ChangeLog b/ChangeLog
index 83c2f0f228df74618632c96b51454dca83e66f90..371967b0bba62a2abcbdc74df92568acd2a3fc12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-03  Tom Tromey  <tromey@redhat.com>
 
+       * header.am (install-@DIR@HEADERS): Use INSTALL_HEADER.
+       * header-vars.am (INSTALL_HEADER): New macro.
+
        * automake.texi (Rebuilding): New node.
 
 2000-12-29  Derek Price  <derek.price@openavenue.com>

diff --git a/TODO b/TODO
index 5bb791751e0ad5970f83d9ccbb15641a2390c4d2..3d3899de79a1e07f4cb594b0f0df6888c80ecc45 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,6 @@
+we need a document describing automake from the end user's point of view
+eg describe INSTALL_HEADER there, among other things
+
 *
     Alexandre Oliva:
     > Hmm...  Interesting.  It must have been a side effect of the enabling

diff --git a/header-vars.am b/header-vars.am
index aa82f86eeb72801dff249933ef1acb13ec33d023..2745ffbc4e16ebbf18090dffe8ba7f74f00a1289 100644 (file)
--- a/header-vars.am
+++ b/header-vars.am
@@ -65,6 +65,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 ## These are defined because otherwise make on NetBSD V1.1 will print

diff --git a/header.am b/header.am
index 318d9142df738f28b1e7ac30d1da92504233affa..060c7fa6a4ff10ffc671f685b9898887c5fa3e6f 100644 (file)
--- a/header.am
+++ b/header.am
@@ -25,8 +25,8 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS)
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
 BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
 NOBASE   f="$$p"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
+         echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
 
 uninstall-@DIR@HEADERS:

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index aa82f86eeb72801dff249933ef1acb13ec33d023..2745ffbc4e16ebbf18090dffe8ba7f74f00a1289 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -65,6 +65,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_FLAG =
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
 
 ## These are defined because otherwise make on NetBSD V1.1 will print

diff --git a/lib/am/header.am b/lib/am/header.am
index 318d9142df738f28b1e7ac30d1da92504233affa..060c7fa6a4ff10ffc671f685b9898887c5fa3e6f 100644 (file)
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -25,8 +25,8 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS)
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
 BASE     f="`echo $$p | sed -e 's|^.*/||'`"; \
 NOBASE   f="$$p"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
+         echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
 
 uninstall-@DIR@HEADERS: