summaryrefslogtreecommitdiff
path: root/gnattools
diff options
context:
space:
mode:
Diffstat (limited to 'gnattools')
-rw-r--r--gnattools/ChangeLog13
-rw-r--r--gnattools/Makefile.in10
2 files changed, 14 insertions, 9 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index 169a0143f99..7139322df5b 100644
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-26 Andreas Schwab <schwab@suse.de>
+
+ * Makefile.in (fsrcdir): Point to gcc directory, not gcc/ada.
+ (INCLUDES_FOR_SUBDIR): Adjust.
+ (ADA_INCLUDES_FOR_SUBDIR): Adjust.
+
2008-08-01 Paolo Bonzini <bonzini@gnu.org>
* configure.ac (warn_cflags): Substitute.
@@ -105,8 +111,8 @@
2005-02-02 Nathanael Nerode <neroden@gcc.gnu.org>
- * Makefile.in: Remove use of cc_set_by_configure; just use
- plain old CC from the top level in this case.
+ * Makefile.in: Remove use of cc_set_by_configure; just use
+ plain old CC from the top level in this case.
2005-01-30 Nathanael Nerode <neroden@gcc.gnu.org>
Merge from mainline at tag libada-gnattools-merge-20050129:
@@ -115,7 +121,7 @@
2004-12-13 Nathanael Nerode <neroden@gcc.gnu.org>
- * Makefile.in: Reinstate stamp-gnatlib check.
+ * Makefile.in: Reinstate stamp-gnatlib check.
2004-12-02 Nathanael Nerode <neroden@gcc.gnu.org>
@@ -146,4 +152,3 @@ Copyright 2004, 2005 Free Software Foundation, Inc.
This ChangeLog is free software; the Free Software Foundation gives
unlimited permission to copy, distribute, and modify it.
-
diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in
index ed40ba54411..de887c0a537 100644
--- a/gnattools/Makefile.in
+++ b/gnattools/Makefile.in
@@ -56,13 +56,13 @@ ADAFLAGS= -gnatpg -gnata
# For finding the GCC build dir, which is used far too much
GCC_DIR=../gcc
-# Absolute srcdir for gcc/ada (why do we want absolute? I dunno)
-fsrcdir := $(shell cd $(srcdir)/../gcc/ada/; ${PWD_COMMAND})
+# Absolute srcdir for gcc (why do we want absolute? I dunno)
+fsrcdir := $(shell cd $(srcdir)/../gcc/; ${PWD_COMMAND})
# Useful "subroutines" for the excess includes
-INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir) -I$(fsrcdir)/../config \
- -I$(fsrcdir)/../../include -I$(fsrcdir)/..
-ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)
+INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada -I$(fsrcdir)/config \
+ -I$(fsrcdir)/../include -I$(fsrcdir)
+ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
# Variables for gnattools1, native
TOOLS_FLAGS_TO_PASS_1= \