another _INSTALL var fix

[platform/upstream/automake.git] / lib / am / progs.am

diff --git a/lib/am/progs.am b/lib/am/progs.am
index 406b2f8..604cfd7 100644 (file)
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -16,17 +16,24 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
-       $(NORMAL_INSTALL)
+       @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(@DIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-       list="$(@DIR@_PROGRAMS)"; for p in $$list; do \
+       @list="$(@DIR@_PROGRAMS)"; for p in $$list; do \
+## This works even in Cygwin32, because we've explicitly touched the
+## "real" program name after building it.
          if test -f $$p; then \
-           $(INSTALL_PROGRAM) $$p $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+## Note that we explicitly set the libtool mode.  This avoids any
+## lossage if the install program doesn't have a name that libtool
+## expects.
+           echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p@EXEEXT@ $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@"; \
+           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p@EXEEXT@ $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@; \
          else :; fi; \
        done
 
 uninstall-@DIR@PROGRAMS:
+       $(NORMAL_UNINSTALL)
        list="$(@DIR@_PROGRAMS)"; for p in $$list; do \
-         rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+         rm -f $(@DIR@dir)/`echo $$p|sed '$(transform)'`@EXEEXT@; \
        done