From 1a89415bdcfba3de7b4de084d57a668a4321c92d Mon Sep 17 00:00:00 2001
From: Fred Kiefer <fredkiefer@gmx.de>
Date: Sun, 2 Dec 2001 11:45:01 +0000
Subject: [PATCH] [initialize] and [imageNamed:] use hardcoded
 @GNUSTEP_INSTALL_LIBDIR only for non-GNUstep foundation library.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11600 72102866-910b-0410-8b05-ffd578937521
---
 Source/NSImage.m | 50 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/Source/NSImage.m b/Source/NSImage.m
index 3081118d0..686ec6119 100644
--- a/Source/NSImage.m
+++ b/Source/NSImage.m
@@ -57,10 +57,6 @@
 BOOL	NSImageDoesCaching = YES;	/* enable caching	*/
 BOOL	NSImageForceCaching = NO;	/* use on missmatch	*/
 
-// Resource directories
-static NSString* gnustep_libdir = @GNUSTEP_INSTALL_LIBDIR;
-static NSString* NSImage_PATH = @"Images";
-
 @interface	GSRepData : NSObject
 {
 @public
@@ -134,10 +130,17 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
 {
   if (self == [NSImage class])
     {
-      NSBundle	*system = [NSBundle bundleWithPath: gnustep_libdir];
+#ifdef GNUSTEP_BASE_LIBRARY
+      NSString	*path = [NSBundle pathForGNUstepResource: @"nsmapping"
+				  ofType: @"strings"
+				  inDirectory: @"Images"];
+#else
+      NSBundle	*system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
       NSString	*path = [system pathForResource: @"nsmapping"
 					 ofType: @"strings"
-				    inDirectory: NSImage_PATH];
+				    inDirectory: @"Images"];
+#endif
+
       // Initial version
       [self setVersion: 1];
 
@@ -216,14 +219,36 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
       /* If not found then search in system */
       if (!path)
 	{
-	  NSBundle *system = [NSBundle bundleWithPath: gnustep_libdir];
-
 	  if (ext)
-	    path = [system pathForResource: the_name
-				    ofType: ext
-			       inDirectory: NSImage_PATH];
+	    {
+#ifdef GNUSTEP_BASE_LIBRARY
+	      path = [NSBundle pathForGNUstepResource: the_name
+			       ofType: ext
+			       inDirectory: @"Images"];
+#else
+	      NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
+	  
+	      path = [system pathForResource: the_name
+			     ofType: ext
+			     inDirectory: @"Images"];
+#endif 
+	    }
 	  else 
 	    {
+#ifdef GNUSTEP_BASE_LIBRARY
+	      id o, e;
+
+	      e = [array objectEnumerator];
+	      while ((o = [e nextObject]))
+		{
+		  path = [NSBundle pathForGNUstepResource: the_name
+			       ofType: o
+			       inDirectory: @"Images"];
+		  if (path != nil && [path length] != 0)
+		    break;
+		}
+#else
+	      NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
 	      id o, e;
 
 	      e = [array objectEnumerator];
@@ -231,10 +256,11 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
 		{
 		  path = [system pathForResource: the_name
 					  ofType: o
-				     inDirectory: NSImage_PATH];
+				     inDirectory: @"Images"];
 		  if (path != nil && [path length] != 0)
 		    break;
 		}
+#endif
 	    }
 	}