From ee86b8a746ab3c3e7571c8f69cfccef4d5d7ea4f Mon Sep 17 00:00:00 2001 From: Andrew McCallum Date: Tue, 28 May 1996 18:45:37 +0000 Subject: [PATCH] (ALL_INCLUDE_FLAGS): Undo last change, except use name `srcdir-include' instead of `include'. This should allow building is a separate directory than the source, yet still avoid confusion between and on win32 systems. (gnustep/base:): Use `srcdir-include' instead of `include' for extra links needed when building in a separate directory than the source. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1570 72102866-910b-0410-8b05-ffd578937521 --- Source/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Makefile.in b/Source/Makefile.in index 82ce5fec3..e753c35e8 100644 --- a/Source/Makefile.in +++ b/Source/Makefile.in @@ -85,7 +85,7 @@ NEXT_NEXT_INCLUDES = -I/usr/include GNU_NEXT_INCLUDES = -I$(srcdir) NEXT_INCLUDES = @NEXT_INCLUDES@ -ALL_INCLUDE_FLAGS = -I. $(NEXT_INCLUDES) $(INCLUDEFLAGS) +ALL_INCLUDE_FLAGS = -I. -I./srcdir-include $(NEXT_INCLUDES) $(INCLUDEFLAGS) ALL_CPPFLAGS = $(ALL_INCLUDE_FLAGS) $(CPPFLAGS) ALL_CFLAGS = $(CFLAGS) ALL_OBJCFLAGS = $(CFLAGS) -Wno-protocol @@ -516,8 +516,9 @@ gnustep/base: ln -s ./include base # Make necessary links to source headers if compiling in seperate dir if [ ! -r ./include/Collection.h ]; then \ - ln -s ../$(srcdir)/include ./include/base; \ - (cd include; ln -s . gnustep); \ + mkdir srcdir-include; \ + ln -s ../$(srcdir)/include ./srcdir-include/base; \ + (cd srcdir-include; ln -s . gnustep); \ fi # This deletion is necessary, because the CVS repository contains # an emtpy `Foundation' directory that used to hold the OpenStep headers.