From 0cc291f75906d763855f3ad7c067379bfd19411d Mon Sep 17 00:00:00 2001 From: Jeffrey A Law Date: Thu, 8 Oct 1998 16:17:12 +0000 Subject: [PATCH] Makefile.in (cpplib.o): Use unlibsubdir. * Makefile.in (cpplib.o): Use unlibsubdir. Somehow lost during unlibsubdir changes. From-SVN: r22925 --- gcc/ChangeLog | 4 ++++ gcc/Makefile.in | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 73e72b1bb82..30e39a44b4f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +Thu Oct 8 17:15:04 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (cpplib.o): Use unlibsubdir. + Thu Oct 8 12:50:47 1998 Jim Wilson * loop.c (get_condition): Allow combine when either compare is diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 9f24109d1df..c463730a114 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1881,11 +1881,11 @@ cppmain.o: cppmain.c $(CONFIG_H) cpplib.h system.h gansidecl.h cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status system.h \ gansidecl.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \ - -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ - -DCROSS_INCLUDE_DIR=\"$(tooldir)/sys-include\" \ - -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \ + -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/g++\" \ + -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \ + -DCROSS_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/../$(target_alias)/sys-include\" \ + -DTOOL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/../$(target_alias)/include\" \ -c `echo $(srcdir)/cpplib.c | sed 's,^\./,,'` cpperror.o: cpperror.c $(CONFIG_H) cpplib.h system.h gansidecl.h