AddDirectoryTo{HaikuImage,...} refactoring

Move common code from AddDirectoryToHaikuImage/AddDirectoryToPackage to AddDirectoryToContainer. AddDirectoryToPackage was incorrect, using an incorrect search directory for the attribute files.
2011-07-17 16:54:12 +02:00
parent d1f40ef636
commit dcdeed6176
2 changed files with 13 additions and 23 deletions
@@ -340,16 +340,8 @@ actions BuildHaikuPackage1

 rule AddDirectoryToPackage package : directoryTokens : attributeFiles
 {
-	local dir = [ AddDirectoryToContainer $(package) : $(directoryTokens) ] ;
-	local grist = [ FHaikuPackageGrist $(package) ] ;
-
-	if $(attributeFiles) {
-		SEARCH on $(attributeFiles)
-			+= [ FDirName $(HAIKU_TOP) data package_directories $(grist) ] ;
-		ATTRIBUTE_FILES on $(dir) += $(attributeFiles) ;
-	}
-
-	return $(dir) ;
+	return [ AddDirectoryToContainer $(package)
+		: $(directoryTokens) : $(attributeFiles) ] ;
 }