From 2d93867897e40a510f0b428dca6fc33531eb304a Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 23 Jun 1998 19:01:50 +0000 Subject: [PATCH] Tue Jun 23 14:55:05 1998 Mike Stump * Makefile.am (install-exec-local): Don't let EXEEXT interfere with the program transform name. * Makefile.in: Rebuild. --- binutils/ChangeLog | 6 ++++++ binutils/Makefile.am | 6 +++--- binutils/Makefile.in | 8 ++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index b0acc2a9d2..9058cfde57 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +Tue Jun 23 14:55:05 1998 Mike Stump + + * Makefile.am (install-exec-local): Don't let EXEEXT interfere + with the program transform name. + * Makefile.in: Rebuild. + Tue Jun 23 11:08:53 1998 Nick Clifton * readelf.c: Rewrite to use fopen/fread ratehr than mmap. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index c4529b2fe4..300241f117 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -157,7 +157,7 @@ objcopy_SOURCES = objcopy.c not-strip.c $(WRITE_DEBUG_SRCS) $(BULIBS) strings_SOURCES = strings.c $(BULIBS) readelf_SOURCES = readelf.c version.c -readelf_LDADD = $(INTLLIBS) +readelf_LDADD = $(INTLLIBS) $(LIBIBERTY) strip_new_SOURCES = objcopy.c is-strip.c $(WRITE_DEBUG_SRCS) $(BULIBS) @@ -328,8 +328,8 @@ CLEANFILES = dep.sed .dep .dep1 install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS) @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/-new//'|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/-new//'|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done $(mkinstalldirs) $(tooldir)/bin diff --git a/binutils/Makefile.in b/binutils/Makefile.in index ee1463e1ae..45312e1686 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -207,7 +207,7 @@ objcopy_SOURCES = objcopy.c not-strip.c $(WRITE_DEBUG_SRCS) $(BULIBS) strings_SOURCES = strings.c $(BULIBS) readelf_SOURCES = readelf.c version.c -readelf_LDADD = $(INTLLIBS) +readelf_LDADD = $(INTLLIBS) $(LIBIBERTY) strip_new_SOURCES = objcopy.c is-strip.c $(WRITE_DEBUG_SRCS) $(BULIBS) @@ -327,7 +327,7 @@ addr2line_LDADD = $(LDADD) addr2line_DEPENDENCIES = ../bfd/libbfd.la ../libiberty/libiberty.a addr2line_LDFLAGS = readelf_OBJECTS = readelf.o version.o -readelf_DEPENDENCIES = +readelf_DEPENDENCIES = ../libiberty/libiberty.a readelf_LDFLAGS = nm_new_OBJECTS = nm.o bucomm.o version.o filemode.o nm_new_LDADD = $(LDADD) @@ -1100,8 +1100,8 @@ mostlyclean-local: install-exec-local: $(bin_PROGRAMS) $(noinst_PROGRAMS) @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/-new//'|sed '$(transform)'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/-new//'|sed '$(transform)'`; \ + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done $(mkinstalldirs) $(tooldir)/bin