From dcee8b635e95e2bd2ad8199174a845e4252d91dd Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Fri, 27 Apr 2001 13:02:16 +0000
Subject: [PATCH] * automake.in (&am_install_var): Transform `ONE_PRIMARY'. *
 data.am: Use it. * header.am: Include data.am.

---
 ChangeLog        |  7 +++++++
 automake.in      | 12 ++++++++----
 data.am          |  3 ++-
 header.am        | 50 ++----------------------------------------------
 lib/am/data.am   |  3 ++-
 lib/am/header.am | 50 ++----------------------------------------------
 6 files changed, 23 insertions(+), 102 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90f3d682..0e2d9dd6 100644
--- 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 191ac792..946ca357 100755
--- 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 329f367d..2bdfe5fa 100644
--- 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 add1ee48..bc944454 100644
--- 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 329f367d..2bdfe5fa 100644
--- 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 add1ee48..bc944454 100644
--- 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
-- 
2.43.5