From b83ce071085cf12919a0eb4039963a9f74173b72 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Sun, 1 Aug 2004 20:13:27 +0000 Subject: [PATCH] update install-% rule to match newer libtool commands. 2004-08-01 Manish Singh * plug-ins/common/mkgen.pl: update install-% rule to match newer libtool commands. * plug-ins/common/Makefile.am: regenerated. --- ChangeLog | 7 +++++++ plug-ins/common/Makefile.am | 10 +++++++--- plug-ins/common/mkgen.pl | 10 +++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d46cc1b8c..c401171810 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-08-01 Manish Singh + + * plug-ins/common/mkgen.pl: update install-% rule to match newer + libtool commands. + + * plug-ins/common/Makefile.am: regenerated. + 2004-08-01 Manish Singh * configure.in: Really really fix WINDRES logic. diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am index 2a6d52a53d..45cfdba93e 100644 --- a/plug-ins/common/Makefile.am +++ b/plug-ins/common/Makefile.am @@ -185,9 +185,13 @@ EXTRA_PROGRAMS = \ install-%: % @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libexecdir) - @if test -f $<; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $< $(DESTDIR)$(libexecdir)/`echo $<|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $< $(DESTDIR)$(libexecdir)/`echo $<|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + @p=$<; p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \ else :; fi AlienMap2_SOURCES = \ diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl index e5166c48ae..034e28e754 100755 --- a/plug-ins/common/mkgen.pl +++ b/plug-ins/common/mkgen.pl @@ -76,9 +76,13 @@ $opts install-\%: \% \@\$(NORMAL_INSTALL) \$(mkinstalldirs) \$(DESTDIR)\$(libexecdir) - \@if test -f \$<; then \\ - echo " \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) \$< \$(DESTDIR)\$(libexecdir)/`echo \$<|sed 's/\$(EXEEXT)\$\$//'|sed '\$(transform)'|sed 's/\$\$/\$(EXEEXT)/'`"; \\ - \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) \$< \$(DESTDIR)\$(libexecdir)/`echo \$<|sed 's/\$(EXEEXT)\$\$//'|sed '\$(transform)'|sed 's/\$\$/\$(EXEEXT)/'`; \\ + \@p=\$<; p1=`echo \$\$p|sed 's/\$(EXEEXT)\$\$//'`; \\ + if test -f \$\$p \\ + || test -f \$\$p1 \\ + ; then \\ + f=`echo "\$\$p1" | sed 's,^.*/,,;\$(transform);s/\$\$/\$(EXEEXT)/'`; \\ + echo " \$(INSTALL_PROGRAM_ENV) \$(LIBTOOL) --mode=install \$(libexecPROGRAMS_INSTALL) \$\$p \$(DESTDIR)\$(libexecdir)/\$\$f"; \\ + \$(INSTALL_PROGRAM_ENV) \$(LIBTOOL) --mode=install \$(libexecPROGRAMS_INSTALL) \$\$p \$(DESTDIR)\$(libexecdir)/\$\$f || exit 1; \\ else :; fi EOT