diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 54 |
2 files changed, 34 insertions, 26 deletions
@@ -1,3 +1,9 @@ +2002-09-29 Andrew Cagney <ac131313@redhat.com> + + Revert below (note that src does not contain Makefile.tpl): + * Makefile.tpl: Make subsituted variables more autoconfy. + * Makefile.in: Regenerate. + 2002-09-29 Nathanael Nerode <neroden@gcc.gnu.org> * configure: Revert accidentally applied changes. diff --git a/Makefile.in b/Makefile.in index 81c65f9..ce64167 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,29 +26,29 @@ NOTPARALLEL = .NOTPARALLEL $(NOTPARALLEL): -srcdir = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -includedir = @includedir@ -oldincludedir = @oldincludedir@ -infodir = @infodir@ -mandir = @mandir@ +srcdir = . + +prefix = /usr/local +exec_prefix = $(prefix) + +bindir=${exec_prefix}/bin +sbindir=${exec_prefix}/sbin +libexecdir=${exec_prefix}/libexec +datadir=${prefix}/share +sysconfdir=${prefix}/etc +sharedstatedir=${prefix}/com +localstatedir=${prefix}/var +libdir=${exec_prefix}/lib +includedir=${prefix}/include +oldincludedir=/usr/include +infodir=${prefix}/info +mandir=${prefix}/man gxx_include_dir=@gxx_include_dir@ -tooldir = @tooldir@ -build_tooldir = @build_tooldir@ +tooldir = $(exec_prefix)/$(target_alias) +build_tooldir = $(exec_prefix)/$(target_alias) -program_transform_name = @program_transform_name@ +program_transform_name = man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 @@ -59,11 +59,13 @@ man6dir = $(mandir)/man6 man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 +infodir = $(prefix)/info +includedir = $(prefix)/include # Directory in which the compiler finds executables, libraries, etc. libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) GDB_NLM_DEPS = -SHELL = @config_shell@ +SHELL = /bin/sh # pwd command to use. Allow user to override default by setting PWDCMD in # the environment to account for automounters. The make variable must not @@ -128,9 +130,9 @@ BZIPPROG = bzip2 MD5PROG = md5sum # These values are substituted by configure. -DEFAULT_YACC = @DEFAULT_YACC@ -DEFAULT_LEX = @DEFAULT_LEX@ -DEFAULT_M4 = @DEFAULT_M4@ +DEFAULT_YACC = yacc +DEFAULT_LEX = lex +DEFAULT_M4 = m4 BISON = `if [ -f $$r/bison/bison ] ; then \ echo $$r/bison/bison -L $$s/bison/ ; \ @@ -513,7 +515,7 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) # macro for build!=host builds. ALL_BUILD_MODULES_LIST = \ all-build-libiberty -ALL_BUILD_MODULES = @all_build_modules@ +ALL_BUILD_MODULES = # This is a list of the configure targets for all of the modules which # are compiled using the native tools. @@ -1672,7 +1674,7 @@ all-gas: all-libiberty all-opcodes all-bfd all-intl all-gawk: all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib -GDB_TK = @GDB_TK@ +GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK) all-gettext: all-gnuserv: |