diff options
| author | Ian Lance Taylor <ian@airs.com> | 1995-11-03 17:44:16 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1995-11-03 17:44:16 +0000 |
| commit | 293129ca0e89741ca809f186cd89773f2ec04776 (patch) | |
| tree | 5055c88e6f46c4d42a677cec9398d23af1610b32 | |
| parent | d3e8ed54bd87e32c087472954b4ee582c5f4b1b0 (diff) | |
| download | gdb-293129ca0e89741ca809f186cd89773f2ec04776.zip gdb-293129ca0e89741ca809f186cd89773f2ec04776.tar.gz gdb-293129ca0e89741ca809f186cd89773f2ec04776.tar.bz2 | |
Permit user to override DEMANGLER_PROG from command line. From
Manfred Hollstein <manfred@lts.sel.alcatel.de>.
* Makefile.in ($(DEMANGLER_PROG)): Depend upon
$(DEMANGLER_PROG).1.
(install): Don't depend upon $(DEMANGLER_PROG).1. Only install
$(DEMANGLER_PROG).1 if $(DEMANGLER_PROG) is not empty.
| -rw-r--r-- | binutils/ChangeLog | 9 | ||||
| -rw-r--r-- | binutils/Makefile.in | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 647c4af..5e9e85e 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +Fri Nov 3 12:38:09 1995 Ian Lance Taylor <ian@cygnus.com> + + Permit user to override DEMANGLER_PROG from command line. From + Manfred Hollstein <manfred@lts.sel.alcatel.de>. + * Makefile.in ($(DEMANGLER_PROG)): Depend upon + $(DEMANGLER_PROG).1. + (install): Don't depend upon $(DEMANGLER_PROG).1. Only install + $(DEMANGLER_PROG).1 if $(DEMANGLER_PROG) is not empty. + Wed Nov 1 15:04:57 1995 Manfred Hollstein KS/EF4A 60/1F/110 #40283 <manfred@lts.sel.alcatel.de> * Makefile.in (syslex.o): add -I$(srcdir) if compiling in a diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 05a5523..878d4c9 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -259,7 +259,7 @@ version.o: version.c Makefile cplus-dem.o: $(BASEDIR)/libiberty/cplus-dem.c $(INCDIR)/getopt.h $(CC) -c -DMAIN -DVERSION='"$(VERSION)"' $(ALL_CFLAGS) $(BASEDIR)/libiberty/cplus-dem.c -$(DEMANGLER_PROG): cplus-dem.o $(LIBIBERTY) underscore.o +$(DEMANGLER_PROG): cplus-dem.o $(LIBIBERTY) underscore.o $(DEMANGLER_PROG).1 $(CC) $(CFLAGS) $(LDFLAGS) -o $(DEMANGLER_PROG) cplus-dem.o $(LIBIBERTY) $(EXTRALIBS) underscore.o arparse.c: arparse.y @@ -565,14 +565,16 @@ etags tags: TAGS TAGS: force etags $(INCDIR)/*.h $(srcdir)/*.[hc] -install: all $(DEMANGLER_PROG).1 +install: all for i in $(PROGS) ; do \ $(INSTALL_XFORM) $$i $(bindir)/`echo $$i | sed -e 's/.new//'` ; \ done for i in $(MANPAGES) ; do \ $(INSTALL_XFORM1) $(srcdir)/$$i.1 $(man1dir)/$$i.1 ; \ done - $(INSTALL_XFORM1) $(DEMANGLER_PROG).1 $(man1dir)/$(DEMANGLER_PROG).1 + if [ x$(DEMANGLER_PROG) != x ]; then \ + $(INSTALL_XFORM1) $(DEMANGLER_PROG).1 $(man1dir)/$(DEMANGLER_PROG).1; \ + fi -if [ -d $(tooldir) ]; then \ if [ -d $(tooldir)/bin ]; then true; else mkdir $(tooldir)/bin; fi; \ for i in $(TOOL_PROGS) ; do \ |