From 86f09a9f103aff0f2ff5ec35fc7f70990a189d43 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 27 Apr 2001 13:00:43 +0000 Subject: [PATCH] * automake.in (&am_install_var): Transform `PRIMARY'. * data.am: Equip with %PRIMARY%. --- ChangeLog | 5 +++++ automake.in | 7 ++++--- data.am | 22 +++++++++++----------- lib/am/data.am | 22 +++++++++++----------- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e003b6d..90f3d682 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-04-27 Akim Demaille + + * automake.in (&am_install_var): Transform `PRIMARY'. + * data.am: Equip with %PRIMARY%. + 2001-04-27 Akim Demaille * automake.in (@conditional_stack): Rename as... diff --git a/automake.in b/automake.in index 046bc7f3..191ac792 100755 --- a/automake.in +++ b/automake.in @@ -7285,9 +7285,10 @@ sub am_install_var ? $exec_dir_p {$X} : ($X =~ /exec/)); $output_rules .= &file_contents ($file, - ('DIR' => $X, - 'NDIR' => $nodir_name, - 'BASE' => $strip_subdir, + ('PRIMARY' => $primary, + 'DIR' => $X, + 'NDIR' => $nodir_name, + 'BASE' => $strip_subdir, 'EXEC' => $exec_p, 'INSTALL' => $install_p, diff --git a/data.am b/data.am index 32eb39db..329f367d 100644 --- a/data.am +++ b/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% diff --git a/lib/am/data.am b/lib/am/data.am index 32eb39db..329f367d 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% -- 2.43.5