From: Tom Tromey <tromey@redhat.com>
Date: Mon, 23 Mar 1998 18:07:55 +0000 (+0000)
Subject: headers can appear in build directory
X-Git-Tag: Release-1-2h~4
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=6260e1bb1c6482ef025639873acd4e7fa4505739;p=automake.git

headers can appear in build directory
---

diff --git a/ChangeLog b/ChangeLog
index 8bc30894..eeeb07a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Mon Mar 23 07:55:04 1998  Tom Tromey  <tromey@cygnus.com>
 
+	* header.am (install-@DIR@HEADERS): A header can appear in the
+	build directory as well as the source directory.
+
 	* automake.in (handle_yacc_lex_cxx): Push lib sources onto
 	de_ansi_files before generating ._c dependencies.  Test
 	libobj8.test.
diff --git a/header.am b/header.am
index b65a2707..d0ae6ba6 100644
--- a/header.am
+++ b/header.am
@@ -21,8 +21,10 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list='$(@DIR@_HEADERS)'; for p in $$list; do \
-	  echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \
-	  $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \
+## A header file can be in the source directory or the build directory.
+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \
 	done
 
 uninstall-@DIR@HEADERS:
diff --git a/lib/am/header.am b/lib/am/header.am
index b65a2707..d0ae6ba6 100644
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -21,8 +21,10 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
 	@list='$(@DIR@_HEADERS)'; for p in $$list; do \
-	  echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p"; \
-	  $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/$$p; \
+## A header file can be in the source directory or the build directory.
+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \
 	done
 
 uninstall-@DIR@HEADERS: