headers can appear in build directory

diff --git a/ChangeLog b/ChangeLog
index 8bc3089..eeeb07a 100644 (file)
--- 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 b65a270..d0ae6ba 100644 (file)
--- 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 b65a270..d0ae6ba 100644 (file)
--- 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: