diff options
Diffstat (limited to 'gnattools')
| -rw-r--r-- | gnattools/ChangeLog | 6 | ||||
| -rw-r--r-- | gnattools/Makefile.in | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog index 4daff87..bdcd968 100644 --- a/gnattools/ChangeLog +++ b/gnattools/ChangeLog @@ -1,3 +1,9 @@ +2015-12-06 Eric Botcazou <ebotcazou@adacore.com> + + PR ada/50048 + * Makefile.in (ftop_srcdir): New variable. + (INCLUDES_FOR_SUBDIR): Use -iquote and $(ftop_srcdir). + 2015-06-08 John Marino <gnugcc@marino.st> * configure.ac (*-*-dragonfly*): New configuration. diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index 423cc6e..0c889ee 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -57,12 +57,16 @@ ADAFLAGS= -gnatpg -gnata # For finding the GCC build dir, which is used far too much GCC_DIR=../gcc +# Full path to top source directory +ftop_srcdir := $(shell cd $(srcdir)/..;${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)/ada -I$(fsrcdir)/config \ - -I$(fsrcdir)/../include -I$(fsrcdir) +INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \ + -iquote $(fsrcdir)/ada -iquote $(fsrcdir)/config \ + -iquote $(fsrcdir) -I$(ftop_srcdir)/include ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada CXX_LFLAGS = \ |