[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: FYI: install program fix for libtool+Cygwin
From: |
Tom Tromey |
Subject: |
Patch: FYI: install program fix for libtool+Cygwin |
Date: |
22 Jul 2001 16:15:50 -0600 |
As mentioned on the main list.
Tom
Index: ChangeLog
from Tom Tromey <address@hidden>
* lib/am/progs.am (install-%DIR%PROGRAMS): Test for `prog, not
`prog.exe' on Cygwin with libtool. From Robert Collins.
Index: lib/am/progs.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/progs.am,v
retrieving revision 1.31
diff -u -r1.31 progs.am
--- lib/am/progs.am 2001/04/09 09:50:33 1.31
+++ lib/am/progs.am 2001/07/22 21:49:32
@@ -32,11 +32,16 @@
## Funny invocation because Makefile variable can be empty, leading to
## a syntax error in sh.
@list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
+## On Cygwin with libtool test won't see `foo.exe' but instead `foo'.
+## So we check for both.
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+?LIBTOOL? || test -f $$p1 \
+ ; 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.
- f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ f=`echo $$p1|sed '$(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"; \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Patch: FYI: install program fix for libtool+Cygwin,
Tom Tromey <=