diff options
| author | Tom Tromey <tromey@redhat.com> | 1999-12-19 04:09:23 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 1999-12-19 04:09:23 +0000 |
| commit | 7e326d1c6674e92f871685df1057be6238a34b95 (patch) | |
| tree | 441255925273fbbdff16b9d5e7dee84546460073 /lib/am/header.am | |
| parent | a6cd6ca7b0e6849c5e298c8c857f61ed1411b965 (diff) | |
| download | automake-7e326d1c6674e92f871685df1057be6238a34b95.tar.gz | |
Partial fix for PR automake/40:
* lisp.am (install-@DIR@LISP): Handle nobase_ case.
(uninstall-@DIR@LISP): Likewise.
* header.am (install-@DIR@HEADERS): Handle nobase_ case.
(uninstall-@DIR@HEADERS): Likewise.
* data.am (install-@DIR@DATA): Handle nobase_ case.
(uninstall-@DIR@DATA): Likewise.
* automake.in (am_primary_prefixes): Recognize `nobase_' prefix.
(am_install_var): Recognize and handle `nobase_' prefix.
Diffstat (limited to 'lib/am/header.am')
| -rw-r--r-- | lib/am/header.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/am/header.am b/lib/am/header.am index 3b437d242..5cf5e8c34 100644 --- a/lib/am/header.am +++ b/lib/am/header.am @@ -23,7 +23,8 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS) @list='$(@DIR@_HEADERS)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ +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; \ done @@ -31,7 +32,8 @@ install-@DIR@HEADERS: $(@DIR@_HEADERS) uninstall-@DIR@HEADERS: @$(NORMAL_UNINSTALL) @list='$(@DIR@_HEADERS)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ +BASE f="`echo $$p | sed -e 's|^.*/||'`"; \ +NOBASE f="$$p"; \ echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \ rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \ done |