* Check in merge from gcc2. See ChangeLog.11 and ChangeLog.12

[thirdparty/gcc.git] / gcc / prefix.c

diff --git a/gcc/prefix.c b/gcc/prefix.c
index c07944764d42fa790200cfe95a7dfbd98cef5f76..1c96c58e54ad741b8252957e218eb2c34628f497 100644 (file)
--- a/gcc/prefix.c
+++ b/gcc/prefix.c
@@ -240,7 +240,7 @@ translate_name (name)
      char *name;
 {
   char code = name[0];
-  char *key, *prefix;
+  char *key, *prefix = 0;
   int keylen;
 
   if (code != '@' && code != '$')
@@ -268,11 +268,10 @@ translate_name (name)
        prefix = std_prefix;
     }
   else
-    {
-      prefix = getenv (key);
-      if (prefix == 0)
-       prefix = concat ("$", key, NULL_PTR);
-    }
+    prefix = getenv (key);
+
+  if (prefix == 0)
+    prefix = PREFIX;
 
   /* Remove any trailing directory separator from what we got.  */
   if (prefix[strlen (prefix) - 1] == '/'