From 01c03710f0acd6384a3d98b09bcc1063d4f3f66d Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 20 May 2013 19:30:54 +0200
Subject: [PATCH] BuildHaikuPackage rule: Add grist to package info file

... to avoids clashes with equally named targets.
---
 build/jam/PackageRules | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/jam/PackageRules b/build/jam/PackageRules
index 602cef045b..a6cb302762 100644
--- a/build/jam/PackageRules
+++ b/build/jam/PackageRules
@@ -289,6 +289,8 @@ rule HaikuPackage package
 
 rule BuildHaikuPackage package : packageInfo
 {
+	packageInfo = $(packageInfo:G=package-info) ;
+
 	local grist = [ FHaikuPackageGrist $(package) ] ;
 
 	local tempDir = [ FDirName $(HAIKU_PACKAGES_BUILD_DIR) $(grist) ] ;
@@ -311,7 +313,7 @@ rule BuildHaikuPackage package : packageInfo
 	AddVariableToScript $(script) : addBuildCompatibilityLibDir
 		: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
 	AddVariableToScript $(script) : compressionLevel
-		: $(HAIKU_PACKAGE_COMPRESSION_LEVEL) ;
+		: [ on $(package) return $(HAIKU_PACKAGE_COMPRESSION_LEVEL) ] ;
 	AddVariableToScript $(script) : updateOnly
 		: [ on $(package) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] ;
 	AddTargetVariableToScript $(script) : <build>addattr ;