Re: 52-factored-install.patch

[Akim Demaille]

I think I finally have it.  I apologize for all the iterations I
needed :(

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (&am_install_var): Recognize whether predefined
        directories are `data' or `exec'.
        * libs.am, ltlib.am, progs.am, python.am, scripts.am: Install
        ?EXEC?.


(No Makefile.in diff for Automake).


Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.936
diff -u -u -r1.936 automake.in
--- automake.in 2001/02/26 13:59:47 1.936
+++ automake.in 2001/02/26 18:52:50
@@ -7075,12 +7075,34 @@
                next;
            }
 
+           # Directories installed during 'install-exec' phase.
+           my %exec_dir_p =
+             (
+              'bin'            => 1,
+              'sbin'           => 1,
+              'libexec'        => 1,
+              'data'           => 0,
+              'sysconf'        => 1,
+              'localstate'     => 1,
+              'lib'            => 1,
+              'info'           => 0,
+              'man'            => 0,
+              'include'        => 0,
+              'oldinclude'     => 0,
+              'pkgdata'        => 0,
+              'pkglib'         => 1,
+              'pkginclude'     => 0
+             );
+           my $exec_p = (defined $exec_dir_p {$X}
+                         ? $exec_dir_p {$X}
+                         : ($X =~ /exec/));
+
            $output_rules .=
              &file_contents ($file,
                              &transform ('DIR'  => $X,
                                          'NDIR' => $nodir_name,
                                          'BASE' => $strip_subdir,
-                                         'EXEC' => $X =~ /exec/)
+                                         'EXEC' => $exec_p)
                              . $ltxform
                              . $cygxform);
        }
Index: libs.am
===================================================================
RCS file: /cvs/automake/automake/libs.am,v
retrieving revision 1.15
diff -u -u -r1.15 libs.am
--- libs.am 2001/02/26 09:14:43 1.15
+++ libs.am 2001/02/26 18:52:51
@@ -17,7 +17,8 @@
 ## 02111-1307, USA.
 
 _am_installdirs += $(DESTDIR)$(@address@hidden)
-.PHONY install-exec-am: address@hidden@LIBRARIES
+?EXEC?.PHONY install-exec-am: address@hidden@LIBRARIES
+?!EXEC?.PHONY install-data-am: address@hidden@LIBRARIES
 address@hidden@LIBRARIES: $(@address@hidden)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@address@hidden)
Index: ltlib.am
===================================================================
RCS file: /cvs/automake/automake/ltlib.am,v
retrieving revision 1.15
diff -u -u -r1.15 ltlib.am
--- ltlib.am 2001/02/26 09:14:43 1.15
+++ ltlib.am 2001/02/26 18:52:51
@@ -18,7 +18,8 @@
 ## 02111-1307, USA.
 
 _am_installdirs += $(DESTDIR)$(@address@hidden)
-.PHONY install-exec-am: address@hidden@LTLIBRARIES
+?EXEC?.PHONY install-exec-am: address@hidden@LTLIBRARIES
+?!EXEC?.PHONY install-data-am: address@hidden@LTLIBRARIES
 address@hidden@LTLIBRARIES: $(@address@hidden)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@address@hidden)
Index: progs.am
===================================================================
RCS file: /cvs/automake/automake/progs.am,v
retrieving revision 1.25
diff -u -u -r1.25 progs.am
--- progs.am 2001/02/26 09:14:43 1.25
+++ progs.am 2001/02/26 18:52:51
@@ -17,7 +17,8 @@
 ## 02111-1307, USA.
 
 _am_installdirs += $(DESTDIR)$(@address@hidden)
-.PHONY install-exec-am: address@hidden@PROGRAMS
+?EXEC?.PHONY install-exec-am: address@hidden@PROGRAMS
+?!EXEC?.PHONY install-data-am: address@hidden@PROGRAMS
 address@hidden@PROGRAMS: $(@address@hidden)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@address@hidden)
Index: python.am
===================================================================
RCS file: /cvs/automake/automake/python.am,v
retrieving revision 1.5
diff -u -u -r1.5 python.am
--- python.am 2001/02/26 09:14:43 1.5
+++ python.am 2001/02/26 18:52:51
@@ -17,7 +17,8 @@
 ## 02111-1307, USA.
 
 _am_installdirs += $(DESTDIR)$(@address@hidden)
-.PHONY install-exec-am: address@hidden@PYTHON
+?EXEC?.PHONY install-exec-am: address@hidden@PYTHON
+?!EXEC?.PHONY install-data-am: address@hidden@PYTHON
 address@hidden@PYTHON: $(@address@hidden)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@address@hidden)
Index: scripts.am
===================================================================
RCS file: /cvs/automake/automake/scripts.am,v
retrieving revision 1.35
diff -u -u -r1.35 scripts.am
--- scripts.am 2001/02/26 09:14:43 1.35
+++ scripts.am 2001/02/26 18:52:51
@@ -17,7 +17,8 @@
 ## 02111-1307, USA.
 
 _am_installdirs += $(DESTDIR)$(@address@hidden)
-.PHONY install-exec-am: address@hidden@SCRIPTS
+?EXEC?.PHONY install-exec-am: address@hidden@SCRIPTS
+?!EXEC?.PHONY install-data-am: address@hidden@SCRIPTS
 address@hidden@SCRIPTS: $(@address@hidden)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(@address@hidden)