diff options
| author | Akim Demaille <akim@epita.fr> | 2001-04-27 13:00:44 +0000 |
|---|---|---|
| committer | Akim Demaille <akim@epita.fr> | 2001-04-27 13:00:44 +0000 |
| commit | bd9fd822f63a307a1ea67f8c92c0cfbe088170ac (patch) | |
| tree | a5f2f9f894944c88add42acd206e61a155256c40 /lib/am/data.am | |
| parent | 0fe183e528e6d125443de09c7fce0edb4220324f (diff) | |
| download | automake-bd9fd822f63a307a1ea67f8c92c0cfbe088170ac.tar.gz | |
* automake.in (&am_install_var): Transform `PRIMARY'.
* data.am: Equip with %PRIMARY%.
Diffstat (limited to 'lib/am/data.am')
| -rw-r--r-- | lib/am/data.am | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/am/data.am b/lib/am/data.am index 32eb39db9..329f367d7 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -22,22 +22,22 @@ if %?INSTALL% _am_installdirs += $(DESTDIR)$(%NDIR%dir) -?EXEC?.PHONY install-exec-am: install-%DIR%DATA -?!EXEC?.PHONY install-data-am: install-%DIR%DATA -install-%DIR%DATA: $(%DIR%_DATA) +?EXEC?.PHONY install-exec-am: install-%DIR%%PRIMARY% +?!EXEC?.PHONY install-data-am: install-%DIR%%PRIMARY% +install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. - @list='$(%DIR%_DATA)'; for p in $$list; do \ + @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -## If the _DATA variable has an entry like foo/bar, install it as +## If the _%PRIMARY% variable has an entry like foo/bar, install it as ## $(destdir)/bar, not $(destdir)/foo/bar. The user can always make a ## new dir variable for the latter case. ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ + echo " $(INSTALL_%PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(INSTALL_%PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ done endif %?INSTALL% @@ -47,10 +47,10 @@ endif %?INSTALL% ## -------------- ## if %?INSTALL% -.PHONY uninstall-am: uninstall-%DIR%DATA -uninstall-%DIR%DATA: +.PHONY uninstall-am: uninstall-%DIR%%PRIMARY% +uninstall-%DIR%%PRIMARY%: @$(NORMAL_UNINSTALL) - @list='$(%DIR%_DATA)'; for p in $$list; do \ + @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \ @@ -71,5 +71,5 @@ endif %?INSTALL% ## -------------- ## if %?DIST% -DIST_COMMON += $(%DIR%_DATA) +DIST_COMMON += $(%DIR%_%PRIMARY%) endif %?DIST% |