From 54e916385ebc1f90ea32506beba40760f8561db4 Mon Sep 17 00:00:00 2001
From: nicola <nicola@72102866-910b-0410-8b05-ffd578937521>
Date: Thu, 15 Feb 2007 00:57:28 +0000
Subject: [PATCH] Update for filesystem changes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24585 72102866-910b-0410-8b05-ffd578937521
---
 configure    | 10 ++++------
 configure.ac | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 3237f96..3393a01 100755
--- a/configure
+++ b/configure
@@ -2385,11 +2385,7 @@ unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
 # For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
 # GNUSTEP_SYSTEM_ROOT if not set yet.
 if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
-  if test x"$GNUSTEP_IS_FLATTENED" = x""; then
-    GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
-  else
-    GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
-  fi
+  GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
 fi
 
 if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
@@ -2401,10 +2397,12 @@ if test "$GNUSTEP_IS_FLATTENED" = no; then
   clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
   obj_dir=$clean_target_cpu/$clean_target_os
   GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
+  GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO
 else
   GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
+  GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
 fi
-CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS"
+CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
 LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
 
 #--------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 84c4a65..200a1fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,11 +64,7 @@ unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
 # For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
 # GNUSTEP_SYSTEM_ROOT if not set yet.
 if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
-  if test x"$GNUSTEP_IS_FLATTENED" = x""; then
-    GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
-  else
-    GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
-  fi
+  GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
 fi
 
 if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
@@ -80,10 +76,12 @@ if test "$GNUSTEP_IS_FLATTENED" = no; then
   clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
   obj_dir=$clean_target_cpu/$clean_target_os
   GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
+  GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO
 else
   GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
+  GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
 fi
-CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS"
+CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
 LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
 
 #--------------------------------------------------------------------