diff --git a/ChangeLog b/ChangeLog index 9ec71b65f..0acfdabb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2007-02-15 Richard Frith-Macdonald + + * Source/NSTimeZone.m: + * Source/Makefile.postamble: + * Source/NSProcessInfo.m: + * Source/GNUmakefile: + * Source/NSConcreteNumber.m: + * Headers/Foundation/NSCoder.h: + * Headers/Foundation/NSByteOrder.h: + * Headers/Foundation/NSObject.h: + * Headers/Foundation/NSDecimal.h: + * Headers/Foundation/Foundation.h: + Move GSConfig.h to the GNUstepBase subdirectory so that it doesn't + appear at the top level when FHS layout is used, thus avoiding any + possible conflict with another file of the same name in /usr/include + 2007-02-15 Nicola Pero Important: do not update from trunk if you need stability. diff --git a/Headers/Foundation/Foundation.h b/Headers/Foundation/Foundation.h index 6bfbe9216..fc260f6d3 100644 --- a/Headers/Foundation/Foundation.h +++ b/Headers/Foundation/Foundation.h @@ -31,7 +31,7 @@ #import #import -#import +#import #import #import diff --git a/Headers/Foundation/NSByteOrder.h b/Headers/Foundation/NSByteOrder.h index 3379cb68e..e0ae12b11 100644 --- a/Headers/Foundation/NSByteOrder.h +++ b/Headers/Foundation/NSByteOrder.h @@ -26,7 +26,7 @@ #define __NSByteOrder_h_GNUSTEP_BASE_INCLUDE #import -#include +#include #if defined(__cplusplus) extern "C" { diff --git a/Headers/Foundation/NSCoder.h b/Headers/Foundation/NSCoder.h index 7c0ddc37a..01cd1e8e6 100644 --- a/Headers/Foundation/NSCoder.h +++ b/Headers/Foundation/NSCoder.h @@ -228,7 +228,7 @@ extern "C" { /* * Include GSConfig.h for typedefs/defines of uint8_t, int32_t int64_t */ -#include +#include /** diff --git a/Headers/Foundation/NSDecimal.h b/Headers/Foundation/NSDecimal.h index ce35f5478..785445a38 100644 --- a/Headers/Foundation/NSDecimal.h +++ b/Headers/Foundation/NSDecimal.h @@ -27,7 +27,7 @@ #define __NSDecimal_h_GNUSTEP_BASE_INCLUDE #import -#include +#include #import diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h index 604bbea85..23e055fe0 100644 --- a/Headers/Foundation/NSObject.h +++ b/Headers/Foundation/NSObject.h @@ -31,7 +31,7 @@ #import #import -#include +#include #include #include #import diff --git a/SSL/Makefile.postamble b/SSL/Makefile.postamble index 91390e3b8..479836236 100644 --- a/SSL/Makefile.postamble +++ b/SSL/Makefile.postamble @@ -91,4 +91,4 @@ endif # Run configure manually if you need to pass any options config.status: - ./configure \ No newline at end of file + ./configure diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 936ee98d0..7424ca819 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -388,7 +388,7 @@ dynamic-load.h \ $(HEADER_DIR_BASE)/preface.h \ $(GNUSTEP_TARGET_DIR)/mframe.h \ $(GNUSTEP_TARGET_DIR)/config.h \ -$(GNUSTEP_TARGET_DIR)/GSConfig.h +$(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h ifeq ($(HAVE_INET_PTON), no) GNU_CFILES += inet_pton.c diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble index 11b0b4499..8f2a42d65 100644 --- a/Source/Makefile.postamble +++ b/Source/Makefile.postamble @@ -54,8 +54,9 @@ after-install:: $(INSTALL_DATA) ../Headers/Additions/GNUstepBase/$$file \ $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \ done - $(INSTALL_DATA) $(GNUSTEP_TARGET_DIR)/GSConfig.h \ - $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR) + $(MKDIRS) $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GNUstepBase + $(INSTALL_DATA) $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h \ + $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \ services=/etc/services; \ if [ "`$(WHOAMI)`" != root ]; then \ @@ -80,7 +81,6 @@ before-uninstall:: for file in $(GNU_HEADERS); do \ rm -f $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \ done - rm -f $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GSConfig.h # Things to do before cleaning # before-clean:: @@ -98,7 +98,6 @@ after-distclean:: NSNumber[0-9]*.m GSValue[0-9]*.m rm -rf $(GNUSTEP_TARGET_DIR)/config.h rm -rf $(GNUSTEP_TARGET_DIR)/mframe.h - rm -rf $(GNUSTEP_TARGET_DIR)/GSConfig.h rm -rf $(GNUSTEP_TARGET_CPU) # Things to do before checking @@ -123,10 +122,10 @@ $(GNUSTEP_TARGET_DIR)/config.h: ../config.status -mv $(HEADER_DIR_BASE)/config.h $(GNUSTEP_TARGET_DIR) -touch $(GNUSTEP_TARGET_DIR)/config.h -$(GNUSTEP_TARGET_DIR)/GSConfig.h: ../config.status - $(MKDIRS) $(GNUSTEP_TARGET_DIR) - -mv $(HEADER_DIR_BASE)/GSConfig.h $(GNUSTEP_TARGET_DIR) - -touch $(GNUSTEP_TARGET_DIR)/GSConfig.h +$(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h: ../config.status + $(MKDIRS) $(GNUSTEP_TARGET_DIR)/GNUstepBase + -mv $(GNUSTEP_TARGET_DIR)/GSConfig.h $(GNUSTEP_TARGET_DIR)/GNUstepBase + -touch $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h $(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status $(MKDIRS) $(GNUSTEP_TARGET_DIR) diff --git a/Source/NSConcreteNumber.m b/Source/NSConcreteNumber.m index cae2a45e1..5e2f2e381 100644 --- a/Source/NSConcreteNumber.m +++ b/Source/NSConcreteNumber.m @@ -24,7 +24,7 @@ #include "config.h" #include "GNUstepBase/preface.h" -#include "GSConfig.h" +#include "GNUstepBase/GSConfig.h" #include "Foundation/NSObjCRuntime.h" #include "Foundation/NSString.h" #include "Foundation/NSException.h" diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m index a78fa8848..853461566 100644 --- a/Source/NSProcessInfo.m +++ b/Source/NSProcessInfo.m @@ -88,7 +88,7 @@ #undef id #endif -#include "GSConfig.h" +#include "GNUstepBase/GSConfig.h" #include "Foundation/NSString.h" #include "Foundation/NSArray.h" #include "Foundation/NSBundle.h" diff --git a/Source/NSTimeZone.m b/Source/NSTimeZone.m index 65a832a61..5d1853877 100644 --- a/Source/NSTimeZone.m +++ b/Source/NSTimeZone.m @@ -107,7 +107,7 @@ #include "Foundation/NSByteOrder.h" #include "Foundation/NSDebug.h" #include "GNUstepBase/GSCategories.h" -#include "GSConfig.h" +#include "GNUstepBase/GSConfig.h" #include "GSPrivate.h" #ifdef HAVE_TZHEAD