BaseTools: Fixed a bug to generate correct path of PACKAGE_RELATIVE_PATH

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <yingke.d.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17642 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 1d49a0316daf3334f1e8d457bd32fd45172dc758..0342709a3a6377f8c73c1f4c796d9f4bd9cf5b74 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -555,8 +555,16 @@ cleanlib:
             LibraryMakeCommandList.append(Command)\r
 \r
         package_rel_dir = self._AutoGenObject.SourceDir\r
-        if os.sep in package_rel_dir:\r
-            package_rel_dir = package_rel_dir[package_rel_dir.index(os.sep) + 1:]\r
+        current_dir = self.Macros["WORKSPACE"]\r
+        found = False\r
+        while not found and os.sep in package_rel_dir:\r
+            index = package_rel_dir.index(os.sep)\r
+            current_dir = os.path.join(current_dir, package_rel_dir[:index])\r
+            for fl in os.listdir(current_dir):\r
+                if fl.endswith('.dec'):\r
+                    found = True\r
+                    break\r
+            package_rel_dir = package_rel_dir[index + 1:]\r
 \r
         MakefileTemplateDict = {\r
             "makefile_header"           : self._FILE_HEADER_[self._FileType],\r