From 6260e1bb1c6482ef025639873acd4e7fa4505739 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 23 Mar 1998 18:07:55 +0000 Subject: [PATCH] headers can appear in build directory --- ChangeLog | 3 +++ header.am | 6 ++++-- lib/am/header.am | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) 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 + * 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: -- 2.43.5