From 1de4b9ab382145f64ea08df5b5cb03b507e27304 Mon Sep 17 00:00:00 2001
From: "Philippe C.D. Robert" <probert@siggraph.org>
Date: Wed, 2 Jan 2002 16:33:52 +0000
Subject: [PATCH] Libraries, Gorm apps and tools use the install path now, too.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@11949 72102866-910b-0410-8b05-ffd578937521
---
 PCGormProj/PCGormMakefileFactory.m | 2 +-
 PCLibProj/PCLibMakefileFactory.m   | 5 +++--
 PCToolProj/PCToolMakefileFactory.m | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/PCGormProj/PCGormMakefileFactory.m b/PCGormProj/PCGormMakefileFactory.m
index eabfa71..d8232df 100644
--- a/PCGormProj/PCGormMakefileFactory.m
+++ b/PCGormProj/PCGormMakefileFactory.m
@@ -77,7 +77,7 @@ static PCGormMakefileFactory *_factory = nil;
 
     [string appendString:[NSString stringWithFormat:@"PACKAGE_NAME=%@\n",prName]];
     [string appendString:[NSString stringWithFormat:@"APP_NAME=%@\n",prName]];
-    // [string appendString:[NSString stringWithFormat:@"%@_PRINCIPAL_CLASS=%@\n",prName,[prDict objectForKey:PCPrincipalClass]]];
+    [string appendString:[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR=% @\n",[prDict objectForKey:PCInstallDir]]];
     [string appendString:[NSString stringWithFormat:@"%@_MAIN_MODEL_FILE=%@\n",prName,[prDict objectForKey:PCMainGModelFile]]];
     [string appendString:[NSString stringWithFormat:@"%@_APPLICATION_ICON=%@\n",prName, [prDict objectForKey:PCAppIcon]]];
 
diff --git a/PCLibProj/PCLibMakefileFactory.m b/PCLibProj/PCLibMakefileFactory.m
index 09dbf4c..ec0ea12 100644
--- a/PCLibProj/PCLibMakefileFactory.m
+++ b/PCLibProj/PCLibMakefileFactory.m
@@ -85,8 +85,9 @@ static PCLibMakefileFactory *_factory = nil;
     // Install path
     [string appendString:[NSString stringWithFormat:@"%@_HEADER_FILES_DIR=.\n",libName]];
     [string appendString:[NSString stringWithFormat:@"%@_HEADER_FILES_INSTALL_DIR=/%@\n",libName,prName]];
-    [string appendString:[NSString stringWithFormat:@"%@_INSTALLATION_DIR=$(GNUSTEP_LOCAL_ROOT)\n",[prName uppercaseString]]];
-    [string appendString:[NSString stringWithFormat:@"%@_INSTALL_PREFIX=$(GNUSTEP_LOCAL_ROOT)\n",[prName uppercaseString]]];
+    [string appendString:[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR=%@\n",[prDict objectForKey:PCInstallDir]]];
+    [string appendString:[NSString stringWithFormat:@"%@_INSTALLATION_DIR=$(GNUSTEP_INSTALLATION_DIR)\n",[prName uppercaseString]]];
+    [string appendString:[NSString stringWithFormat:@"%@_INSTALL_PREFIX=$(GNUSTEP_INSTALLATION_DIR)\n",[prName uppercaseString]]];
     [string appendString:@"ADDITIONAL_INCLUDE_DIRS = -I..\n"];
     [string appendString:@"srcdir = .\n"];
 
diff --git a/PCToolProj/PCToolMakefileFactory.m b/PCToolProj/PCToolMakefileFactory.m
index 5c966c8..0434b73 100644
--- a/PCToolProj/PCToolMakefileFactory.m
+++ b/PCToolProj/PCToolMakefileFactory.m
@@ -78,7 +78,8 @@ static PCToolMakefileFactory *_factory = nil;
 
     [string appendString:[NSString stringWithFormat:@"PACKAGE_NAME=%@\n",prName]];
     [string appendString:[NSString stringWithFormat:@"TOOL_NAME=%@\n",prName]];
-    //    [string appendString:[NSString stringWithFormat:@"%@_PRINCIPAL_CLASS=%@\n",prName,[prDict objectForKey:PCPrincipalClass]]];
+    [string appendString:[NSString stringWithFormat:@"GNUSTEP_INSTALLATION_DIR=% @\n",[prDict objectForKey:PCInstallDir]]];
+
     [string appendString:[NSString stringWithFormat:@"%@_TOOL_ICON=%@\n",prName, [prDict objectForKey:PCToolIcon]]];
 
     [string appendString:@"#\n\n"];