Don't add directories explicitly to packages

Directories are added implicitly when entries are added, so there's no
need to add those directories. Directories without content don't need to
be added either, since due to the read-only nature of packages they will
remain empty.
This commit is contained in:
Ingo Weinhold 2011-07-03 09:10:27 +02:00
parent 204261b63a
commit 319b1a7b3b
1 changed files with 4 additions and 7 deletions

View File

@ -172,8 +172,6 @@ local logoArtwork =
SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ; SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
AddFilesToPackage data artwork : $(logoArtwork) ; AddFilesToPackage data artwork : $(logoArtwork) ;
AddDirectoryToPackage data sounds ;
# Mail spell check dictionaries # Mail spell check dictionaries
local spellFiles = words geekspeak ; local spellFiles = words geekspeak ;
spellFiles = $(spellFiles:G=spell) ; spellFiles = $(spellFiles:G=spell) ;
@ -204,8 +202,10 @@ local cannaDicCanna = [ Glob $(cannaDir)/dic/canna
AddFilesToPackage data Canna default : $(cannaDefault) ; AddFilesToPackage data Canna default : $(cannaDefault) ;
AddFilesToPackage data Canna dic : $(cannaDic) ; AddFilesToPackage data Canna dic : $(cannaDic) ;
AddFilesToPackage data Canna dic canna : $(cannaDicCanna) ; AddFilesToPackage data Canna dic canna : $(cannaDicCanna) ;
AddDirectoryToPackage data Canna dic group ; #AddDirectoryToPackage data Canna dic group ;
AddDirectoryToPackage data Canna dic user ; #AddDirectoryToPackage data Canna dic user ;
# TODO: If those serve any purpose, they should probably live in a writable
# subtree.
local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data keymaps ] local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data keymaps ]
: *.keymap ] ; : *.keymap ] ;
@ -281,9 +281,6 @@ AddFilesToPackage add-ons Screen\ Savers : $(SYSTEM_ADD_ONS_SCREENSAVERS) ;
AddFilesToPackage add-ons disk_systems : <disk_system>intel <disk_system>bfs ; AddFilesToPackage add-ons disk_systems : <disk_system>intel <disk_system>bfs ;
AddDirectoryToPackage data synth ;
AddDirectoryToPackage add-ons input_server methods ;
# optional # optional
# TODO: We should probably build another package (including the data files # TODO: We should probably build another package (including the data files
# above) that can be installed, if desired. # above) that can be installed, if desired.