diff --git a/ChangeLog b/ChangeLog index 2441f3c39..9765a4332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * Source/NSURL.m: Add support for file URLs on mswindows. The path may be of the form C:\... rather than /... (and the colon might be a vertical bar). + Also makefile fixes for bug #26446 2009-05-11 Adam Fedor diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index b993c12f7..5e7fb1e80 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -43,9 +43,9 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make -include ../Version -include ../config.mak -include ../Source/pathconfig/pathconfig.mak +-include ../Version +-include ../config.mak +-include ../Source/pathconfig/pathconfig.mak # The documents to be generated DOCUMENT_NAME = coding-standards diff --git a/NSTimeZones/GNUmakefile b/NSTimeZones/GNUmakefile index 0ff0d2572..4251c58d3 100644 --- a/NSTimeZones/GNUmakefile +++ b/NSTimeZones/GNUmakefile @@ -43,9 +43,9 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make -include ../Version -include ../config.mak -include ../Source/pathconfig/pathconfig.mak +-include ../Version +-include ../config.mak +-include ../Source/pathconfig/pathconfig.mak libgnustep-base_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION) diff --git a/Source/GNUmakefile b/Source/GNUmakefile index e8f76bc01..b2a3ed1c1 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -47,7 +47,7 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ../config.mak -include pathconfig/pathconfig.mak +-include pathconfig/pathconfig.mak # Interface version changes with each minor release libgnustep-base_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION) diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 7c89a7274..cd1b42803 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -43,9 +43,9 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make include $(GNUSTEP_MAKEFILES)/common.make -include ../Version -include ../config.mak -include ../Source/pathconfig/pathconfig.mak +-include ../Version +-include ../config.mak +-include ../Source/pathconfig/pathconfig.mak # DTDs to install dtddir = $(GNUSTEP_LIBRARY)/DTDs