diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | i386/Makefile.in | 5 | ||||
| -rw-r--r-- | i386/Makerules.in | 3 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2006-04-08 Thomas Schwinge <tschwinge@gnu.org> + + * i386/Makefile.in (INCLUDES): Don't add `$(srcdir)/bogus'. + * i386/Makerules.in (INCLUDES): Add + `$(abs_top_srcdir)/$(systype)/bogus'. + Reported by Samuel Thibault <samuel.thibault@ens-lyon.org>. + 2006-04-02 Thomas Schwinge <tschwinge@gnu.org> * Makerules.in (%_user.c, %_server.c): Those are `.PRECIOUS'. diff --git a/i386/Makefile.in b/i386/Makefile.in index 8214560..dd021d9 100644 --- a/i386/Makefile.in +++ b/i386/Makefile.in @@ -119,9 +119,8 @@ vpath i386asm.sym $(srcdir)/i386 vpath mach_i386.srv $(srcdir)/i386 # Our include files; they precede the generic ones. -INCLUDES = -I. -I$(srcdir)/i386at -I$(srcdir)/i386 \ - -I$(srcdir)/include -I$(srcdir)/include/mach/sa \ - -I$(srcdir)/bogus -I$(srcdir) +INCLUDES = -I. -I$(srcdir)/i386at -I$(srcdir)/i386 -I$(srcdir)/include \ + -I$(srcdir)/include/mach/sa -I$(srcdir) # Static dependencies. diff --git a/i386/Makerules.in b/i386/Makerules.in index f6c90da..ef04948 100644 --- a/i386/Makerules.in +++ b/i386/Makerules.in @@ -30,6 +30,9 @@ include $(abs_top_builddir)/$(systype)/linux/Makerules # Some of the i386-specific code checks for these. DEFINES += -DCONTINUATIONS -D__ELF__ -Di386 $(DEFS-$(systype)) +# The system specific ones always override the generic ones. +INCLUDES += -I$(abs_top_srcdir)/$(systype)/bogus + # Arrange for a suitable load address. LDFLAGS-kernel += -Ttext 100000 |