This is the mail archive of the
automake@gnu.org
mailing list for the automake project.
89-transform-primary.patch
- To: Automake <automake at gnu dot org>
- Subject: 89-transform-primary.patch
- From: Akim Demaille <akim at epita dot fr>
- Date: Wed, 28 Mar 2001 09:28:19 +0200
- List-Id: Discussion list for automake <automake.gnu.org>
Index: ChangeLog
from Akim Demaille <akim@epita.fr>
* automake.in (&am_install_var): Transform `PRIMARY'.
* data.am: Equip with %PRIMARY%.
Index: automake.in
--- automake.in Sun, 25 Mar 2001 18:00:42 +0200 akim (am/f/39_automake.i 1.214 755)
+++ automake.in Sun, 25 Mar 2001 18:32:55 +0200 akim (am/f/39_automake.i 1.214 755)
@@ -7134,9 +7167,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,
Index: data.am
--- data.am Mon, 12 Mar 2001 21:28:36 +0100 akim (am/g/46_data.am 1.12 644)
+++ data.am Sun, 25 Mar 2001 18:33:28 +0200 akim (am/g/46_data.am 1.12 644)
@@ -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 @@
## -------------- ##
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 @@
## -------------- ##
if %?DIST%
-DIST_COMMON += $(%DIR%_DATA)
+DIST_COMMON += $(%DIR%_%PRIMARY%)
endif %?DIST%