49-use-if-install.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * data.am, header.am, java.am, libs.am, lisp.am, ltlib.am,
        * progs.am, python.am: Use if/endif instead of ?INSTALL?.
        * java.am (_am_installdirs): Be sure to set it.

Index: data.am
--- data.am Mon, 05 Mar 2001 22:33:22 +0100 akim (am/g/46_data.am 1.10 644)
+++ data.am Sun, 11 Mar 2001 18:34:49 +0100 akim (am/g/46_data.am 1.10 644)
@@ -20,39 +20,43 @@
 ## Installing.  ##
 ## ------------ ##

-?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%DATA
-?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%DATA
-?INSTALL?install-%DIR%DATA: $(%DIR%_DATA)
-?INSTALL?      @$(NORMAL_INSTALL)
-?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+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)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-?INSTALL?      @list='$(%DIR%_DATA)'; for p in $$list; do \
-?INSTALL?        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+       @list='$(%DIR%_DATA)'; 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
 ## $(destdir)/bar, not $(destdir)/foo/bar.  The user can always make a
 ## new dir variable for the latter case.
-?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
-?INSTALL??!BASE?         f="$$p"; \
-?INSTALL?        echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-?INSTALL?        $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-?INSTALL?      done
+?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; \
+       done
+endif %?INSTALL%


 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##

-?INSTALL?.PHONY uninstall-am: uninstall-%DIR%DATA
-?INSTALL?uninstall-%DIR%DATA:
-?INSTALL?      @$(NORMAL_UNINSTALL)
-?INSTALL?      @list='$(%DIR%_DATA)'; for p in $$list; do \
-?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
-?INSTALL??!BASE?         f="$$p"; \
-?INSTALL?        echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
-?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
-?INSTALL?      done
+if %?INSTALL%
+.PHONY uninstall-am: uninstall-%DIR%DATA
+uninstall-%DIR%DATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(%DIR%_DATA)'; 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%


 ## ---------- ##
Index: header.am
--- header.am Wed, 07 Mar 2001 21:02:27 +0100 akim (am/g/38_header.am 1.9 644)
+++ header.am Sun, 11 Mar 2001 18:33:05 +0100 akim (am/g/38_header.am 1.9 644)
@@ -21,34 +21,38 @@
 ## Installing.  ##
 ## ------------ ##

-?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%HEADERS
-?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%HEADERS
-?INSTALL?install-%DIR%HEADERS: $(%DIR%_HEADERS)
-?INSTALL?      @$(NORMAL_INSTALL)
-?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+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.
-?INSTALL?      @list='$(%DIR%_HEADERS)'; for p in $$list; do \
+       @list='$(%DIR%_HEADERS)'; for p in $$list; do \
 ## A header file can be in the source directory or the build directory.
-?INSTALL?        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
-?INSTALL??!BASE?         f="$$p"; \
-?INSTALL?        echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-?INSTALL?        $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-?INSTALL?      done
+         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.  ##
 ## -------------- ##

-?INSTALL?.PHONY uninstall-am: uninstall-%DIR%HEADERS
-?INSTALL?uninstall-%DIR%HEADERS:
-?INSTALL?      @$(NORMAL_UNINSTALL)
-?INSTALL?      @list='$(%DIR%_HEADERS)'; for p in $$list; do \
-?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
-?INSTALL??!BASE?         f="$$p"; \
-?INSTALL?        echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
-?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
-?INSTALL?      done
+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%
Index: java.am
--- java.am Wed, 07 Mar 2001 21:02:27 +0100 akim (am/g/36_java.am 1.8 644)
+++ java.am Sun, 11 Mar 2001 18:40:40 +0100 akim (am/g/36_java.am 1.8 644)
@@ -20,31 +20,36 @@
 ## Installing.  ##
 ## ------------ ##

-?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%JAVA
-?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%JAVA
-?INSTALL?install-%DIR%JAVA: class%DIR%.stamp
-?INSTALL?      @$(NORMAL_INSTALL)
-?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+if %?INSTALL%
+_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?EXEC?.PHONY install-exec-am: install-%DIR%JAVA
+?!EXEC?.PHONY install-data-am: install-%DIR%JAVA
+install-%DIR%JAVA: class%DIR%.stamp
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## A single .java file can be compiled into multiple .class files.  So
 ## we just install all the .class files that got built into this
 ## directory.  This is not optimal, but will have to do for now.
-?INSTALL?      for p in *.class; do \
-?INSTALL?        echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL?        $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL?      done
+       for p in *.class; do \
+         echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+         $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+       done
+endif %?INSTALL%


 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##

-?INSTALL?.PHONY uninstall-am: uninstall-%DIR%JAVA
-?INSTALL?uninstall-%DIR%JAVA:
-?INSTALL?      @$(NORMAL_UNINSTALL)
-?INSTALL?      @for p in *.class; do \
-?INSTALL?        echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL?      done
+if %?INSTALL%
+.PHONY uninstall-am: uninstall-%DIR%JAVA
+uninstall-%DIR%JAVA:
+       @$(NORMAL_UNINSTALL)
+       @for p in *.class; do \
+         echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+         rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+       done
+endif %?INSTALL%


 ## ---------- ##
Index: libs.am
--- libs.am Mon, 05 Mar 2001 22:33:22 +0100 akim (am/g/32_libs.am 1.6 644)
+++ libs.am Sun, 11 Mar 2001 18:35:20 +0100 akim (am/g/32_libs.am 1.6 644)
@@ -20,46 +20,50 @@
 ## Installing.  ##
 ## ------------ ##

-?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%LIBRARIES
-?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES
-?INSTALL?install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
-?INSTALL?      @$(NORMAL_INSTALL)
-?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+if %?INSTALL%
+_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?EXEC?.PHONY install-exec-am: install-%DIR%LIBRARIES
+?!EXEC?.PHONY install-data-am: install-%DIR%LIBRARIES
+install-%DIR%LIBRARIES: $(%DIR%_LIBRARIES)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-?INSTALL?      @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
-?INSTALL?        if test -f $$p; then \
-?INSTALL?          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL?          $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL?        else :; fi; \
-?INSTALL?      done
+       @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+         else :; fi; \
+       done
 ## We do two loops here so that $(POST_INSTALL) can be empty.  If we
 ## merge the two loops, we get a syntax error from sh.  Anyway, having
 ## $(POST_INSTALL) in the middle of the loop essentially renders it
 ## useless; sh never actually executes this command.  Read the GNU
 ## Standards for a little enlightenment on this.
-?INSTALL?      @$(POST_INSTALL)
-?INSTALL?      @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
-?INSTALL?        if test -f $$p; then \
+       @$(POST_INSTALL)
+       @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
 ## Must ranlib after installing because mod time changes.
-?INSTALL?          echo " $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL?          $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL?        else :; fi; \
-?INSTALL?      done
+           echo " $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p"; \
+           $(RANLIB) $(DESTDIR)$(%NDIR%dir)/$$p; \
+         else :; fi; \
+       done
+endif %?INSTALL%


 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##

-?INSTALL?.PHONY uninstall-am: uninstall-%DIR%LIBRARIES
-?INSTALL?uninstall-%DIR%LIBRARIES:
-?INSTALL?      @$(NORMAL_UNINSTALL)
-?INSTALL?      @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
-?INSTALL?        echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL?      done
+if %?INSTALL%
+.PHONY uninstall-am: uninstall-%DIR%LIBRARIES
+uninstall-%DIR%LIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @list='$(%DIR%_LIBRARIES)'; for p in $$list; do \
+         echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+         rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+       done
+endif %?INSTALL%


 ## ---------- ##
Index: lisp.am
--- lisp.am Mon, 05 Mar 2001 22:33:22 +0100 akim (am/g/29_lisp.am 1.11 644)
+++ lisp.am Sun, 11 Mar 2001 18:36:55 +0100 akim (am/g/29_lisp.am 1.11 644)
@@ -20,42 +20,46 @@
 ## Installing.  ##
 ## ------------ ##

-?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%LISP
-?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%LISP
-?INSTALL?install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
-?INSTALL?      @$(NORMAL_INSTALL)
-?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+if %?INSTALL%
+_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?EXEC?.PHONY install-exec-am: install-%DIR%LISP
+?!EXEC?.PHONY install-data-am: install-%DIR%LISP
+install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-?INSTALL?      @list='$(%DIR%_LISP)'; for p in $$list; do \
+       @list='$(%DIR%_LISP)'; for p in $$list; do \
 ## A lisp file can be in the source directory or the build directory.
-?INSTALL?        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
-?INSTALL??!BASE?         f="$$p"; \
-?INSTALL?        echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-?INSTALL?        $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+?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; \
 ## Only install .elc file if it exists.
-?INSTALL?        if test -f $${p}c; then \
-?INSTALL?          echo " $(INSTALL_DATA) $${p}c 
$(DESTDIR)$(%NDIR%dir)/$${f}c"; \
-?INSTALL?          $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \
-?INSTALL?        else : ; fi; \
-?INSTALL?      done
+         if test -f $${p}c; then \
+           echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+           $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \
+         else : ; fi; \
+       done
+endif %?INSTALL%


 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##

-?INSTALL?.PHONY uninstall-am: uninstall-%DIR%LISP
-?INSTALL?uninstall-%DIR%LISP:
-?INSTALL?      @$(NORMAL_UNINSTALL)
-?INSTALL?      @list='$(%DIR%_LISP)'; for p in $$list; do \
-?INSTALL??BASE?          f="`echo $$p | sed -e 's|^.*/||'`"; \
-?INSTALL??!BASE?         f="$$p"; \
-?INSTALL?        echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; 
\
-?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$f 
$(DESTDIR)$(%NDIR%dir)/$${f}c; \
-?INSTALL?      done
+if %?INSTALL%
+.PHONY uninstall-am: uninstall-%DIR%LISP
+uninstall-%DIR%LISP:
+       @$(NORMAL_UNINSTALL)
+       @list='$(%DIR%_LISP)'; for p in $$list; do \
+?BASE?   f="`echo $$p | sed -e 's|^.*/||'`"; \
+?!BASE?          f="$$p"; \
+         echo " rm -f $(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c"; \
+         rm -f $(DESTDIR)$(%NDIR%dir)/$$f $(DESTDIR)$(%NDIR%dir)/$${f}c; \
+       done
+endif %?INSTALL%


 ## ---------- ##
Index: ltlib.am
--- ltlib.am Wed, 07 Mar 2001 21:02:27 +0100 akim (am/g/27_ltlib.am 1.8 644)
+++ ltlib.am Sun, 11 Mar 2001 18:35:43 +0100 akim (am/g/27_ltlib.am 1.8 644)
@@ -21,41 +21,45 @@
 ## Installing.  ##
 ## ------------ ##

-?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%LTLIBRARIES
-?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES
-?INSTALL?install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
-?INSTALL?      @$(NORMAL_INSTALL)
-?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+if %?INSTALL%
+_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?EXEC?.PHONY install-exec-am: install-%DIR%LTLIBRARIES
+?!EXEC?.PHONY install-data-am: install-%DIR%LTLIBRARIES
+install-%DIR%LTLIBRARIES: $(%DIR%_LTLIBRARIES)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-?INSTALL?      @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
-?INSTALL?        if test -f $$p; then \
+       @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
+         if test -f $$p; then \
 ## Note that we explicitly set the libtool mode.  This avoids any lossage
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
 ## permissions to use.
-?INSTALL??LIBTOOL?         echo " $(LIBTOOL) --mode=install $(INSTALL) 
$(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL??LIBTOOL?         $(LIBTOOL) --mode=install $(INSTALL) 
$(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL??!LIBTOOL?        echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$p 
$(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL??!LIBTOOL?        $(INSTALL) $(INSTALL_STRIP_FLAG) $$p 
$(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL?        else :; fi; \
-?INSTALL?      done
+?LIBTOOL?          echo " $(LIBTOOL) --mode=install $(INSTALL) 
$(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?LIBTOOL?          $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$$p $(DESTDIR)$(%NDIR%dir)/$$p; \
+?!LIBTOOL?         echo " $(INSTALL) $(INSTALL_STRIP_FLAG) $$p 
$(DESTDIR)$(%NDIR%dir)/$$p"; \
+?!LIBTOOL?         $(INSTALL) $(INSTALL_STRIP_FLAG) $$p 
$(DESTDIR)$(%NDIR%dir)/$$p; \
+         else :; fi; \
+       done
+endif %?INSTALL%


 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##

-?INSTALL?.PHONY uninstall-am: uninstall-%DIR%LTLIBRARIES
-?INSTALL?uninstall-%DIR%LTLIBRARIES:
-?INSTALL?      @$(NORMAL_UNINSTALL)
-?INSTALL?      @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
-?INSTALL??LIBTOOL?       echo " $(LIBTOOL) --mode=uninstall rm -f 
$(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL??LIBTOOL?       $(LIBTOOL) --mode=uninstall rm -f 
$(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL??!LIBTOOL?      echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
-?INSTALL??!LIBTOOL?      rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
-?INSTALL?      done
+if %?INSTALL%
+.PHONY uninstall-am: uninstall-%DIR%LTLIBRARIES
+uninstall-%DIR%LTLIBRARIES:
+       @$(NORMAL_UNINSTALL)
+       @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
+?LIBTOOL?        echo " $(LIBTOOL) --mode=uninstall rm -f 
$(DESTDIR)$(%NDIR%dir)/$$p"; \
+?LIBTOOL?        $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(%NDIR%dir)/$$p; 
\
+?!LIBTOOL?       echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$p"; \
+?!LIBTOOL?       rm -f $(DESTDIR)$(%NDIR%dir)/$$p; \
+       done
+endif %?INSTALL%


 ## ---------- ##
Index: progs.am
--- progs.am Mon, 05 Mar 2001 22:33:22 +0100 akim (am/g/20_progs.am 1.8 644)
+++ progs.am Sun, 11 Mar 2001 18:33:31 +0100 akim (am/g/20_progs.am 1.8 644)
@@ -22,40 +22,44 @@
 ## Installing.  ##
 ## ------------ ##

-?INSTALL?_am_installdirs += $(DESTDIR)$(%NDIR%dir)
-?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%PROGRAMS
-?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS
-?INSTALL?install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
-?INSTALL?      @$(NORMAL_INSTALL)
-?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
+if %?INSTALL%
+_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?EXEC?.PHONY install-exec-am: install-%DIR%PROGRAMS
+?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS
+install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-?INSTALL?      @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
-?INSTALL?        if test -f $$p; then \
+       @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
+         if test -f $$p; then \
 ## Note that we explicitly set the libtool mode.  This avoids any
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
-?INSTALL?          f=`echo $$p|sed 
's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-?INSTALL??LIBTOOL?        echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) 
--mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
-?INSTALL??LIBTOOL?        $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install 
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
-?INSTALL??!LIBTOOL?       echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p 
$(DESTDIR)$(%NDIR%dir)/$$f"; \
-?INSTALL??!LIBTOOL?       $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p 
$(DESTDIR)$(%NDIR%dir)/$$f; \
-?INSTALL?        else :; fi; \
-?INSTALL?      done
+           f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+?LIBTOOL?         echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install 
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+?LIBTOOL?         $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install 
$(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
+?!LIBTOOL?        echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p 
$(DESTDIR)$(%NDIR%dir)/$$f"; \
+?!LIBTOOL?        $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p 
$(DESTDIR)$(%NDIR%dir)/$$f; \
+         else :; fi; \
+       done
+endif %?INSTALL%


 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##

-?INSTALL?.PHONY uninstall-am: uninstall-%DIR%PROGRAMS
-?INSTALL?uninstall-%DIR%PROGRAMS:
-?INSTALL?      @$(NORMAL_UNINSTALL)
-?INSTALL?      @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
-?INSTALL?        f=`echo $$p|sed 
's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-?INSTALL?        echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
-?INSTALL?        rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
-?INSTALL?      done
+if %?INSTALL%
+.PHONY uninstall-am: uninstall-%DIR%PROGRAMS
+uninstall-%DIR%PROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
+         f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
+         rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
+       done
+endif %?INSTALL%


 ## ---------- ##
Index: python.am
--- python.am Mon, 05 Mar 2001 22:33:22 +0100 akim (am/g/19_python.am 1.7 644)
+++ python.am Sun, 11 Mar 2001 18:36:36 +0100 akim (am/g/19_python.am 1.7 644)
@@ -21,38 +21,43 @@
 ## Installing.  ##
 ## ------------ ##

-?INSTALL?_am_installdirs += $(DESTDIR)$(%DIR%dir)
-?INSTALL??EXEC?.PHONY install-exec-am: install-%DIR%PYTHON
-?INSTALL??!EXEC?.PHONY install-data-am: install-%DIR%PYTHON
-?INSTALL?install-%DIR%PYTHON: $(%DIR%_PYTHON)
-?INSTALL?      @$(NORMAL_INSTALL)
-?INSTALL?      $(mkinstalldirs) $(DESTDIR)$(%DIR%dir)
-?INSTALL?      @list='$(%DIR%_PYTHON)'; for p in $$list; do\
-?INSTALL?        if test -f $(srcdir)/$$p; then \
+if %?INSTALL%
+_am_installdirs += $(DESTDIR)$(%DIR%dir)
+?EXEC?.PHONY install-exec-am: install-%DIR%PYTHON
+?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON
+install-%DIR%PYTHON: $(%DIR%_PYTHON)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(%DIR%dir)
+       @list='$(%DIR%_PYTHON)'; for p in $$list; do\
+         if test -f $(srcdir)/$$p; then \
 ## Don't perform translation, since script name is important.
-?INSTALL?          echo " $(INSTALL_PROGRAM) $(srcdir)/$$p 
$(DESTDIR)$(%DIR%dir)/$$p"; \
-?INSTALL?          $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p; \
-?INSTALL?        else :; fi; \
-?INSTALL?      done
+           echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p"; 
\
+           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(%DIR%dir)/$$p; \
+         else :; fi; \
+       done
 ## Byte-compile must be done at install time, since file times are
 ## encoded in the actual files.
-?INSTALL?      @PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(%DIR%dir) 
$(%DIR%_PYTHON)
+       @PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(%DIR%dir) 
$(%DIR%_PYTHON)
+endif %?INSTALL%


 ## -------------- ##
 ## Uninstalling.  ##
 ## -------------- ##

-?INSTALL?.PHONY uninstall-am: uninstall-%DIR%PYTHON
-?INSTALL?uninstall-%DIR%PYTHON:
-?INSTALL?      @$(NORMAL_UNINSTALL)
-?INSTALL?      list='$(%DIR%_PYTHON)'; for p in $$list; do \
-?INSTALL?        rm -f $(DESTDIR)$(%DIR%dir)/$$p; \
+if %?INSTALL%
+.PHONY uninstall-am: uninstall-%DIR%PYTHON
+uninstall-%DIR%PYTHON:
+       @$(NORMAL_UNINSTALL)
+       list='$(%DIR%_PYTHON)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(%DIR%dir)/$$p; \
 ## This is to remove the .pyc and .pyo byte compiled versions (a bit
 ## of a hack).
-?INSTALL?        rm -f $(DESTDIR)$(%DIR%dir)/$${p}c; \
-?INSTALL?        rm -f $(DESTDIR)$(%DIR%dir)/$${p}o; \
-?INSTALL?      done
+         rm -f $(DESTDIR)$(%DIR%dir)/$${p}c; \
+         rm -f $(DESTDIR)$(%DIR%dir)/$${p}o; \
+       done
+endif %?INSTALL%
+

 ## ---------- ##
 ## Cleaning.  ##