* automake.in (&am_install_var): Transform `PRIMARY'.

* data.am: Equip with %PRIMARY%.

diff --git a/ChangeLog b/ChangeLog
index 3e003b6dd40fc489de99fbe72c144c6689ca5e34..90f3d682b849e8c0a220f97e47d505db8db00c6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-27  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&am_install_var): Transform `PRIMARY'.
+       * data.am: Equip with %PRIMARY%.
+
 2001-04-27  Akim Demaille  <akim@epita.fr>
 
        * automake.in (@conditional_stack): Rename as...

diff --git a/automake.in b/automake.in
index 046bc7f37e3085d3a9496da56738851222708e42..191ac792820e73e8c9fc3d4c3c09cdde32d71201 100755 (executable)
--- 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 32eb39db91b9fc87a8cdba603c035b395e58ebf1..329f367d7563f1e7785b71a7a735bb2d80e94c84 100644 (file)
--- 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 32eb39db91b9fc87a8cdba603c035b395e58ebf1..329f367d7563f1e7785b71a7a735bb2d80e94c84 100644 (file)
--- 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%