From 46f078c0a3feb03712ef50a00fb4f4f433ac49a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Mon, 23 Jul 2018 18:55:06 +0200
Subject: [PATCH] PackageRules: add secondaryArch to the packageInfo grist.

this fixes the generation of multiple secondary architecture package infos.
---
 build/jam/PackageRules | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/jam/PackageRules b/build/jam/PackageRules
index 2d15395417..1df46b0f89 100644
--- a/build/jam/PackageRules
+++ b/build/jam/PackageRules
@@ -49,7 +49,11 @@ rule PreprocessPackageInfo source : directory : architecture
 		[ FDirName $(HAIKU_PACKAGE_INFOS_DIR) generic ]
 	;
 
-	local target = $(source:BSG=package-info)-package-info ;
+	local grist = package-info ;
+	if $(secondaryArchitecture) {
+		grist = $(grist)$(secondaryArchitecture) ;
+	}
+	local target = $(source:BSG=$(grist))-package-info ;
 	MakeLocate $(target) : $(directory) ;
 
 	PreprocessPackageOrRepositoryInfo $(target) : $(source) : $(architecture)