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

* data.am: Use it.
* header.am: Include data.am.

diff --git a/ChangeLog b/ChangeLog
index 90f3d682b849e8c0a220f97e47d505db8db00c6d..0e2d9dd66088df519ca5d3c0d1bf802724767998 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-27  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&am_install_var): Transform `ONE_PRIMARY'.
+       * data.am: Use it.
+       * header.am: Include data.am.
+
+       
 2001-04-27  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&am_install_var): Transform `PRIMARY'.

diff --git a/automake.in b/automake.in
index 191ac792820e73e8c9fc3d4c3c09cdde32d71201..946ca3572f2c60ee90ac1f503497255d7e5dd2ad 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7284,11 +7284,15 @@ sub am_install_var
            my $exec_p = (defined $exec_dir_p {$X}
                          ? $exec_dir_p {$X}
                          : ($X =~ /exec/));
+
+           # Singular form of $PRIMARY.
+           (my $one_primary = $primary) =~ s/S$//;
            $output_rules .= &file_contents ($file,
-                                            ('PRIMARY' => $primary,
-                                             'DIR'     => $X,
-                                             'NDIR'    => $nodir_name,
-                                             'BASE'    => $strip_subdir,
+                                            ('PRIMARY'     => $primary,
+                                             'ONE_PRIMARY' => $one_primary,
+                                             'DIR'         => $X,
+                                             'NDIR'        => $nodir_name,
+                                             'BASE'        => $strip_subdir,
 
                                              'EXEC'    => $exec_p,
                                              'INSTALL' => $install_p,

diff --git a/data.am b/data.am
index 329f367d7563f1e7785b71a7a735bb2d80e94c84..2bdfe5fad582f51d0b7188e6ca91a716b5e266d4 100644 (file)
--- a/data.am
+++ b/data.am
@@ -30,13 +30,14 @@ install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
+## A file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 ## 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_%PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+         echo " $(INSTALL_%ONE_PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
          $(INSTALL_%PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
        done
 endif %?INSTALL%

diff --git a/header.am b/header.am
index add1ee4846be59997a59ebc1ddc47cd9542d4997..bc944454f40ad429365eb443f8267651f18873cf 100644 (file)
--- a/header.am
+++ b/header.am
@@ -17,51 +17,5 @@
 ## 02111-1307, USA.
 
 
-## ------------ ##
-## Installing.  ##
-## ------------ ##
-
-if %?INSTALL%
-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%HEADERS
-?!EXEC?.PHONY install-data-am: install-%DIR%HEADERS
-install-%DIR%HEADERS: $(%DIR%_HEADERS)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
-## Funny invocation because Makefile variable can be empty, leading to
-## a syntax error in sh.
-       @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; \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-         $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-       done
-endif %?INSTALL%
-
-
-## -------------- ##
-## Uninstalling.  ##
-## -------------- ##
-
-if %?INSTALL%
-.PHONY uninstall-am: uninstall-%DIR%HEADERS
-uninstall-%DIR%HEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_HEADERS)'; for p in $$list; do \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
-         rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
-       done
-endif %?INSTALL%
-
-
-## -------------- ##
-## Distributing.  ##
-## -------------- ##
-
-if %?DIST%
-DIST_COMMON += $(%DIR%_HEADERS)
-endif %?DIST%
+## Exactly the same as data.am.
+include data.am

diff --git a/lib/am/data.am b/lib/am/data.am
index 329f367d7563f1e7785b71a7a735bb2d80e94c84..2bdfe5fad582f51d0b7188e6ca91a716b5e266d4 100644 (file)
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -30,13 +30,14 @@ install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \
+## A file can be in the source directory or the build directory.
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 ## 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_%PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+         echo " $(INSTALL_%ONE_PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
          $(INSTALL_%PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
        done
 endif %?INSTALL%

diff --git a/lib/am/header.am b/lib/am/header.am
index add1ee4846be59997a59ebc1ddc47cd9542d4997..bc944454f40ad429365eb443f8267651f18873cf 100644 (file)
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -17,51 +17,5 @@
 ## 02111-1307, USA.
 
 
-## ------------ ##
-## Installing.  ##
-## ------------ ##
-
-if %?INSTALL%
-_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?EXEC?.PHONY install-exec-am: install-%DIR%HEADERS
-?!EXEC?.PHONY install-data-am: install-%DIR%HEADERS
-install-%DIR%HEADERS: $(%DIR%_HEADERS)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
-## Funny invocation because Makefile variable can be empty, leading to
-## a syntax error in sh.
-       @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; \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-         $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-       done
-endif %?INSTALL%
-
-
-## -------------- ##
-## Uninstalling.  ##
-## -------------- ##
-
-if %?INSTALL%
-.PHONY uninstall-am: uninstall-%DIR%HEADERS
-uninstall-%DIR%HEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(%DIR%_HEADERS)'; for p in $$list; do \
-?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
-?!BASE?          f="$$p"; \
-         echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
-         rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
-       done
-endif %?INSTALL%
-
-
-## -------------- ##
-## Distributing.  ##
-## -------------- ##
-
-if %?DIST%
-DIST_COMMON += $(%DIR%_HEADERS)
-endif %?DIST%
+## Exactly the same as data.am.
+include data.am