From ee5fa7e874b8f0d5cfecf46c9e1304327ccef565 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Fri, 3 May 2002 14:15:13 +0000
Subject: [PATCH] A small simplification

[SVN r13639]
---
 new/project.jam      | 36 ++++++++++++++++--------------------
 v2/build/project.jam | 36 ++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/new/project.jam b/new/project.jam
index 13051895c..96ff9c65d 100644
--- a/new/project.jam
+++ b/new/project.jam
@@ -83,31 +83,27 @@ rule lookup ( id : current-location )
     }
     else
     {
-        if $(location)
+        if ! $(location)
         {
-            local module-name = [ module-name $(location) ] ;
-            local base-id = [ $(module-name).id ] ;
+            error Jamfile location must be specified for relative project-id $(id) ;
+        }
+        
+        local module-name = [ module-name $(location) ] ;
+        local base-id = [ $(module-name).id ] ;
 
-            if $(base-id)
-            {
-                if $(project-id)
-                {
-                    local rooted-id = $(base-id)/$(project-id) ;
-                    return $($(rooted-id).jamfile-location) ;
-                }
-                else
-                {
-                    return $($(base-id).jamfile-location) ;
-                }
-            }
-            else
-            {
-                error "Project in $(location) has no project id" ;
-            }
+        if ! $(base-id)
+        {
+            error "Project in $(location) has no project id" ;
+        }
+
+        if $(project-id)
+        {
+            local rooted-id = $(base-id)/$(project-id) ;
+            return $($(rooted-id).jamfile-location) ;
         }
         else
         {
-            error "Jamfile location must be specified for relative project-id" ;
+            return $($(base-id).jamfile-location) ;
         }
     }
 }
diff --git a/v2/build/project.jam b/v2/build/project.jam
index 13051895c..96ff9c65d 100644
--- a/v2/build/project.jam
+++ b/v2/build/project.jam
@@ -83,31 +83,27 @@ rule lookup ( id : current-location )
     }
     else
     {
-        if $(location)
+        if ! $(location)
         {
-            local module-name = [ module-name $(location) ] ;
-            local base-id = [ $(module-name).id ] ;
+            error Jamfile location must be specified for relative project-id $(id) ;
+        }
+        
+        local module-name = [ module-name $(location) ] ;
+        local base-id = [ $(module-name).id ] ;
 
-            if $(base-id)
-            {
-                if $(project-id)
-                {
-                    local rooted-id = $(base-id)/$(project-id) ;
-                    return $($(rooted-id).jamfile-location) ;
-                }
-                else
-                {
-                    return $($(base-id).jamfile-location) ;
-                }
-            }
-            else
-            {
-                error "Project in $(location) has no project id" ;
-            }
+        if ! $(base-id)
+        {
+            error "Project in $(location) has no project id" ;
+        }
+
+        if $(project-id)
+        {
+            local rooted-id = $(base-id)/$(project-id) ;
+            return $($(rooted-id).jamfile-location) ;
         }
         else
         {
-            error "Jamfile location must be specified for relative project-id" ;
+            return $($(base-id).jamfile-location) ;
         }
     }
 }