* Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir,

        INSTALL_PROGRAM, INSTALL_DATA): Use autoconf-set values.
        (docdir): Removed.
        * configure.in (AC_PREREQ): autoconf 2.5 or higher.
        * doc/Makefile.in (bindir, libdir, datadir, mandir, infodir,
        includedir): Use autoconf set values.
        (docdir): Removed.

1 files changed, 28 insertions, 32 deletions

diff --git a/gas/Makefile.in b/gas/Makefile.in
index e2815de..12da6cb 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -34,12 +34,12 @@ prefix = @prefix@
 
 program_transform_name = @program_transform_name@
 exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
+bindir = @bindir@
+libdir = @libdir@
 tooldir = $(exec_prefix)/$(target_alias)
 
-datadir = $(prefix)/lib
-mandir = $(prefix)/man
+datadir = @datadir@
+mandir = @mandir@
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -49,17 +49,16 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
-infodir = $(prefix)/info
-includedir = $(prefix)/include
-docdir = $(datadir)/doc
+infodir = @infodir@
+includedir = @includedir@
 
 VERSION=cygnus-2.6
 
 SHELL = /bin/sh
 
 INSTALL = $${srcroot}/install.sh -c
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
 
@@ -76,6 +75,7 @@ CC = @CC@
 CFLAGS = -g
 LDFLAGS =
 HLDFLAGS = @HLDFLAGS@
+RPATH_ENVVAR = @RPATH_ENVVAR@
 
 MAKEOVERRIDES=
 
@@ -302,8 +302,8 @@ check:  site.exp
 	cp site.exp testsuite/site.exp
 	rootme=`pwd`; export rootme; \
 	srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \
-	LD_LIBRARY_PATH=$$rootme/../bfd:$$rootme/../opcodes:$$LD_LIBRARY_PATH; \
-	export LD_LIBRARY_PATH; \
+	$(RPATH_ENVVAR)=$$rootme/../bfd:$$rootme/../opcodes:$$$(RPATH_ENVVAR); \
+	export $(RPATH_ENVVAR); \
 	cd testsuite; \
 	EXPECT=${EXPECT} ; export EXPECT ; \
 	if [ -f $${rootme}/../expect/expect ] ; then  \
@@ -334,32 +334,29 @@ config-stamp: Makefile conf
 # Compiling object files from source files.
 
 TARG_CPU_DEP_a29k    =
-TARG_CPU_DEP_alpha   = $(srcdir)/config/alpha-opcode.h
+TARG_CPU_DEP_alpha   = $(srcdir)/../include/opcode/alpha.h subsegs.h
 # start-sanitize-arc
-TARG_CPU_DEP_arc     = $(srcdir)/../include/opcode/arc.h
+TARG_CPU_DEP_arc     = $(srcdir)/../include/opcode/arc.h subsegs.h
 # end-sanitize-arc
-TARG_CPU_DEP_arm     =
+TARG_CPU_DEP_arm     = subsegs.h
 TARG_CPU_DEP_generic =
 TARG_CPU_DEP_h8300   = $(srcdir)/../include/opcode/h8300.h
-TARG_CPU_DEP_h8500   = $(srcdir)/../opcodes/h8500-opc.h
-TARG_CPU_DEP_hppa    =
-TARG_CPU_DEP_i386    = $(srcdir)/../include/opcode/i386.h
+TARG_CPU_DEP_h8500   = $(srcdir)/../opcodes/h8500-opc.h subsegs.h
+TARG_CPU_DEP_hppa    = subsegs.h
+TARG_CPU_DEP_i386    = $(srcdir)/../include/opcode/i386.h subsegs.h
 TARG_CPU_DEP_i860    =
 TARG_CPU_DEP_i960    =
 TARG_CPU_DEP_m68k    = $(srcdir)/../include/opcode/m68k.h \
 			$(srcdir)/config/m68k-parse.h subsegs.h
-TARG_CPU_DEP_m88k    = $(srcdir)/config/m88k-opcode.h
-TARG_CPU_DEP_mips    = $(srcdir)/../include/opcode/mips.h
+TARG_CPU_DEP_m88k    = $(srcdir)/config/m88k-opcode.h subsegs.h
+TARG_CPU_DEP_mips    = $(srcdir)/../include/opcode/mips.h subsegs.h
 TARG_CPU_DEP_ns32k   =
-TARG_CPU_DEP_ppc     =
-# start-sanitize-rce
-TARG_CPU_DEP_rce     = $(srcdir)/../opcodes/rce-opc.h
-# end-sanitize-rce
-TARG_CPU_DEP_sh      = $(srcdir)/../opcodes/sh-opc.h
-TARG_CPU_DEP_sparc   =
+TARG_CPU_DEP_ppc     = subsegs.h
+TARG_CPU_DEP_sh      = $(srcdir)/../opcodes/sh-opc.h subsegs.h
+TARG_CPU_DEP_sparc   = subsegs.h
 TARG_CPU_DEP_tahoe   =
 TARG_CPU_DEP_vax     =
-TARG_CPU_DEP_w65     = $(srcdir)/../opcodes/w65-opc.h
+TARG_CPU_DEP_w65     = $(srcdir)/../opcodes/w65-opc.h subsegs.h
 TARG_CPU_DEP_z8k     = $(srcdir)/../opcodes/z8k-opc.h
 
 gasp.o : gasp.c sb.h macro.h config.h
@@ -455,13 +452,12 @@ install:
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
 	$(INSTALL_XFORM) as.new $(bindir)/as; \
 	$(INSTALL_XFORM1) $(srcdir)/doc/as.1 $(man1dir)/as.1; \
+	test -d $(tooldir) || mkdir $(tooldir); \
+	test -d $(tooldir)/bin || mkdir $(tooldir)/bin; \
 	n=`echo as | sed '$(program_transform_name)'`; \
-	if [ -d $(tooldir) ]; then \
-	  if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
-	  rm -f $(tooldir)/bin/as; \
-	  ln $(bindir)/$$n $(tooldir)/bin/as >/dev/null 2>/dev/null \
-	   || $(INSTALL_PROGRAM) as.new $(tooldir)/bin/as; \
-	else true; fi
+	rm -f $(tooldir)/bin/as; \
+	ln $(bindir)/$$n $(tooldir)/bin/as >/dev/null 2>/dev/null \
+	 || $(INSTALL_PROGRAM) as.new $(tooldir)/bin/as
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
 	$(INSTALL_XFORM) gasp.new $(bindir)/gasp