From 5d41bc9af9a872e54abc29fc14fe0120c586e42b Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 29 Apr 2013 16:13:03 +0200
Subject: [PATCH] Add AddPackageFilesToHaikuImage rule

---
 build/jam/HaikuImage       | 2 +-
 build/jam/ImageRules       | 5 +++++
 build/jam/OptionalPackages | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 0fd497d1cd..efd0563d09 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -200,7 +200,7 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs
 # build the haiku system package and add it
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ;
 
-AddFilesToHaikuImage system packages : haiku.hpkg ;
+AddPackageFilesToHaikuImage system : haiku.hpkg ;
 
 
 AddSymlinkToHaikuImage . : /boot/common/apps ;
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index c3cc52893a..c75240b421 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -862,6 +862,11 @@ rule AddBootModuleSymlinksToHaikuImage targets
 		: $(targets) ;
 }
 
+rule AddPackageFilesToHaikuImage location : packages
+{
+	AddFilesToHaikuImage $(location) packages : $(packages) ;
+}
+
 rule AddOptionalHaikuImagePackages packages
 {
 	local package ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 4d1b2f0c26..ad704e16f1 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -579,8 +579,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
 			$(HAIKU_GCC_VERSION[1]) ;
 	}
 
-	AddFilesToHaikuImage system packages : haiku_devel.hpkg ;
-	AddFilesToHaikuImage common packages : makefile_engine.hpkg ;
+	AddPackageFilesToHaikuImage system : haiku_devel.hpkg ;
+	AddPackageFilesToHaikuImage common : makefile_engine.hpkg ;
 }
 
 
@@ -1515,8 +1515,8 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
 
 # Welcome
 if [ IsOptionalHaikuImagePackageAdded Welcome ] {
-	AddFilesToHaikuImage system packages : haiku_userguide.hpkg ;
-	AddFilesToHaikuImage system packages : haiku_welcome.hpkg ;
+	AddPackageFilesToHaikuImage system : haiku_userguide.hpkg ;
+	AddPackageFilesToHaikuImage system : haiku_welcome.hpkg ;
 
 	AddSymlinkToHaikuImage home Desktop	: /boot/system/bin/welcome
 		: Welcome ;