gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 08:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

FHS suppoort update

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24599 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-02-16 08:09:55 +00:00
parent db4ea4f632
commit 707d090214
12 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2007-02-15 Richard Frith-Macdonald <rfm@gnu.org>
* 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 <nicola.pero@meta-innovation.com> 2007-02-15 Nicola Pero <nicola.pero@meta-innovation.com>
Important: do not update from trunk if you need stability. Important: do not update from trunk if you need stability.

2
Headers/Foundation/Foundation.h
View file

@ -31,7 +31,7 @@
#import <objc/objc.h> #import <objc/objc.h>
#import <Foundation/NSObjCRuntime.h> #import <Foundation/NSObjCRuntime.h>
#import <GSConfig.h> #import <GNUstepBase/GSConfig.h>
#import <Foundation/NSDebug.h> #import <Foundation/NSDebug.h>
#import <Foundation/NSObject.h> #import <Foundation/NSObject.h>

2
Headers/Foundation/NSByteOrder.h
View file

@ -26,7 +26,7 @@
#define __NSByteOrder_h_GNUSTEP_BASE_INCLUDE #define __NSByteOrder_h_GNUSTEP_BASE_INCLUDE
#import <GNUstepBase/GSVersionMacros.h> #import <GNUstepBase/GSVersionMacros.h>
#include <GSConfig.h> #include <GNUstepBase/GSConfig.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {

2
Headers/Foundation/NSCoder.h
View file

@ -228,7 +228,7 @@ extern "C" {
/* /*
* Include GSConfig.h for typedefs/defines of uint8_t, int32_t int64_t * Include GSConfig.h for typedefs/defines of uint8_t, int32_t int64_t
*/ */
#include <GSConfig.h> #include <GNUstepBase/GSConfig.h>
/** <override-subclass /> /** <override-subclass />

2
Headers/Foundation/NSDecimal.h
View file

@ -27,7 +27,7 @@
#define __NSDecimal_h_GNUSTEP_BASE_INCLUDE #define __NSDecimal_h_GNUSTEP_BASE_INCLUDE
#import <GNUstepBase/GSVersionMacros.h> #import <GNUstepBase/GSVersionMacros.h>
#include <GSConfig.h> #include <GNUstepBase/GSConfig.h>
#import <Foundation/NSObject.h> #import <Foundation/NSObject.h>

2
Headers/Foundation/NSObject.h
View file

@ -31,7 +31,7 @@
#import <Foundation/NSObjCRuntime.h> #import <Foundation/NSObjCRuntime.h>
#import <GNUstepBase/preface.h> #import <GNUstepBase/preface.h>
#include <GSConfig.h> #include <GNUstepBase/GSConfig.h>
#include <objc/objc.h> #include <objc/objc.h>
#include <objc/typedstream.h> #include <objc/typedstream.h>
#import <Foundation/NSZone.h> #import <Foundation/NSZone.h>

2
SSL/Makefile.postamble
View file

@ -91,4 +91,4 @@ endif
# Run configure manually if you need to pass any options # Run configure manually if you need to pass any options
config.status: config.status:
./configure ./configure

2
Source/GNUmakefile
View file

@ -388,7 +388,7 @@ dynamic-load.h \
$(HEADER_DIR_BASE)/preface.h \ $(HEADER_DIR_BASE)/preface.h \
$(GNUSTEP_TARGET_DIR)/mframe.h \ $(GNUSTEP_TARGET_DIR)/mframe.h \
$(GNUSTEP_TARGET_DIR)/config.h \ $(GNUSTEP_TARGET_DIR)/config.h \
$(GNUSTEP_TARGET_DIR)/GSConfig.h $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h
ifeq ($(HAVE_INET_PTON), no) ifeq ($(HAVE_INET_PTON), no)
GNU_CFILES += inet_pton.c GNU_CFILES += inet_pton.c

15
Source/Makefile.postamble
View file

@ -54,8 +54,9 @@ after-install::
$(INSTALL_DATA) ../Headers/Additions/GNUstepBase/$$file \ $(INSTALL_DATA) ../Headers/Additions/GNUstepBase/$$file \
$(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \ $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
done done
$(INSTALL_DATA) $(GNUSTEP_TARGET_DIR)/GSConfig.h \ $(MKDIRS) $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GNUstepBase
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR) $(INSTALL_DATA) $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h \
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h
if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \ if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \
services=/etc/services; \ services=/etc/services; \
if [ "`$(WHOAMI)`" != root ]; then \ if [ "`$(WHOAMI)`" != root ]; then \
@ -80,7 +81,6 @@ before-uninstall::
for file in $(GNU_HEADERS); do \ for file in $(GNU_HEADERS); do \
rm -f $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \ rm -f $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
done done
rm -f $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GSConfig.h
# Things to do before cleaning # Things to do before cleaning
# before-clean:: # before-clean::
@ -98,7 +98,6 @@ after-distclean::
NSNumber[0-9]*.m GSValue[0-9]*.m NSNumber[0-9]*.m GSValue[0-9]*.m
rm -rf $(GNUSTEP_TARGET_DIR)/config.h rm -rf $(GNUSTEP_TARGET_DIR)/config.h
rm -rf $(GNUSTEP_TARGET_DIR)/mframe.h rm -rf $(GNUSTEP_TARGET_DIR)/mframe.h
rm -rf $(GNUSTEP_TARGET_DIR)/GSConfig.h
rm -rf $(GNUSTEP_TARGET_CPU) rm -rf $(GNUSTEP_TARGET_CPU)
# Things to do before checking # 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) -mv $(HEADER_DIR_BASE)/config.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_DIR)/config.h -touch $(GNUSTEP_TARGET_DIR)/config.h
$(GNUSTEP_TARGET_DIR)/GSConfig.h: ../config.status $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h: ../config.status
$(MKDIRS) $(GNUSTEP_TARGET_DIR) $(MKDIRS) $(GNUSTEP_TARGET_DIR)/GNUstepBase
-mv $(HEADER_DIR_BASE)/GSConfig.h $(GNUSTEP_TARGET_DIR) -mv $(GNUSTEP_TARGET_DIR)/GSConfig.h $(GNUSTEP_TARGET_DIR)/GNUstepBase
-touch $(GNUSTEP_TARGET_DIR)/GSConfig.h -touch $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h
$(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status $(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status
$(MKDIRS) $(GNUSTEP_TARGET_DIR) $(MKDIRS) $(GNUSTEP_TARGET_DIR)

2
Source/NSConcreteNumber.m
View file

@ -24,7 +24,7 @@
#include "config.h" #include "config.h"
#include "GNUstepBase/preface.h" #include "GNUstepBase/preface.h"
#include "GSConfig.h" #include "GNUstepBase/GSConfig.h"
#include "Foundation/NSObjCRuntime.h" #include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSString.h" #include "Foundation/NSString.h"
#include "Foundation/NSException.h" #include "Foundation/NSException.h"

2
Source/NSProcessInfo.m
View file

@ -88,7 +88,7 @@
#undef id #undef id
#endif #endif
#include "GSConfig.h" #include "GNUstepBase/GSConfig.h"
#include "Foundation/NSString.h" #include "Foundation/NSString.h"
#include "Foundation/NSArray.h" #include "Foundation/NSArray.h"
#include "Foundation/NSBundle.h" #include "Foundation/NSBundle.h"

2
Source/NSTimeZone.m
View file

@ -107,7 +107,7 @@
#include "Foundation/NSByteOrder.h" #include "Foundation/NSByteOrder.h"
#include "Foundation/NSDebug.h" #include "Foundation/NSDebug.h"
#include "GNUstepBase/GSCategories.h" #include "GNUstepBase/GSCategories.h"
#include "GSConfig.h" #include "GNUstepBase/GSConfig.h"
#include "GSPrivate.h" #include "GSPrivate.h"
#ifdef HAVE_TZHEAD #ifdef HAVE_TZHEAD