From: Tom Tromey Date: Sun, 4 Feb 2001 04:43:11 +0000 (+0000) Subject: * header.am (install-@DIR@HEADERS): Use INSTALL_HEADER. X-Git-Tag: v1.10.2~2284 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2a26602e448c8b26aff94f2557febaa37b9e493;p=platform%2Fupstream%2Fautomake.git * header.am (install-@DIR@HEADERS): Use INSTALL_HEADER. * header-vars.am (INSTALL_HEADER): New macro. --- diff --git a/ChangeLog b/ChangeLog index 83c2f0f..371967b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-02-03 Tom Tromey + * 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 diff --git a/TODO b/TODO index 5bb7917..3d3899d 100644 --- 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 aa82f86..2745ffb 100644 --- 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 318d914..060c7fa 100644 --- 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 aa82f86..2745ffb 100644 --- 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 318d914..060c7fa 100644 --- 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: