* Makefile.in (install): Do the sed for program_transform_name

	ourselves instead of worrying about INSTALL_XFORM.  This enables
	users to override INSTALL_PROGRAM in the standard way.

	* Makefile.in (c-exp.tab.o, ch-exp.tab.o, m2-exp.tab.o): Don't
	depend on Makefile.in.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4dac5255ae900b0150f0853c8c46d1c2df72dac8..91874fd39880fc0e162c350c0ddda8130bcfcc26 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 Fri Feb 18 08:26:29 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * Makefile.in (install): Do the sed for program_transform_name
+       ourselves instead of worrying about INSTALL_XFORM.  This enables
+       users to override INSTALL_PROGRAM in the standard way.
+
+       * Makefile.in (c-exp.tab.o, ch-exp.tab.o, m2-exp.tab.o): Don't
+       depend on Makefile.in.
+
        * defs.h, valprint.c: Make longest_to_int a function not a macro.
        Only test against INT_MIN if a LONGEST is bigger than an int.
 

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index c12312bf418dd39f3c3815b674a9cfc9148078ac..dfedc1f07d7ed07869515aaf72cf8414cfd3aa47 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -44,8 +44,6 @@ SHELL = /bin/sh
 INSTALL = `cd $(srcdir)/..;pwd`/install.sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
-INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
-INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1
 
 AR = ar
 AR_FLAGS = qv
@@ -493,9 +491,15 @@ gdb.z:gdb.1
 # time it takes for make to check that all is up to date.
 # install-only is intended to address that need.
 install: all install-only
-install-only: 
-       $(INSTALL_XFORM) gdb $(bindir)/gdb
-       $(INSTALL_XFORM1) $(srcdir)/gdb.1 $(man1dir)/gdb.1
+install-only:
+       transformed_name=`echo gdb | sed '$(program_transform_name)'` ; \
+       if test "x$$transformed_name" = x; then \
+         transformed_name=gdb ; \
+       else \
+         true ; \
+       fi ; \
+       $(INSTALL_PROGRAM) gdb $(bindir)/$$transformed_name ; \
+       $(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1
        @$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
 
 uninstall: force
@@ -777,9 +781,10 @@ version.c: Makefile
 # would sometimes re-write it into $(srcdir)/c-exp.tab.c.
 
 # Remove bogus decls for malloc/realloc/free which conflict with everything
-# else.
+# else.  Strictly speaking c-exp.tab.c should therefore depend on
+# Makefile.in, but that was a pretty big annoyance.
 c-exp.tab.o: c-exp.tab.c
-c-exp.tab.c: c-exp.y Makefile.in
+c-exp.tab.c: c-exp.y
        $(YACC) $(YFLAGS) $(srcdir)/c-exp.y
        -sed -e '/extern.*malloc/d' \
             -e '/extern.*realloc/d' \
@@ -799,7 +804,7 @@ ch-exp.tab.o: ch-exp.tab.c
 # the dependency here on c-exp.tab.c is artificial.  Without this
 # dependency, a parallel make will attempt to build both at the same
 # time and the second yacc will pollute the first y.tab.c file.
-ch-exp.tab.c: ch-exp.y Makefile.in c-exp.tab.c
+ch-exp.tab.c: ch-exp.y c-exp.tab.c
        $(YACC) $(YFLAGS) $(srcdir)/ch-exp.y
        -sed -e '/extern.*malloc/d' \
             -e '/extern.*realloc/d' \
@@ -819,7 +824,7 @@ m2-exp.tab.o: m2-exp.tab.c
 # the dependency here on ch-exp.tab.c is artificial.  Without this
 # dependency, a parallel make will attempt to build both at the same
 # time and the second yacc will pollute the first y.tab.c file.
-m2-exp.tab.c: m2-exp.y Makefile.in ch-exp.tab.c
+m2-exp.tab.c: m2-exp.y ch-exp.tab.c
        $(YACC) $(YFLAGS) $(srcdir)/m2-exp.y
        -sed -e '/extern.*malloc/d' \
             -e '/extern.*realloc/d' \