* Moved the "fonts" directory into the "data" directory.
* Moved fonts to where they belong. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33981 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
9c71b326c9
commit
0491552bc3
|
@ -414,11 +414,11 @@ fortuneFiles = $(fortuneFiles:G=etc!fortunes) ;
|
|||
SEARCH on $(fortuneFiles) = [ FDirName $(HAIKU_TOP) data etc fortunes ] ;
|
||||
AddFilesToHaikuImage system etc fortunes : $(fortuneFiles) ;
|
||||
|
||||
local fontDir = [ FDirName $(HAIKU_TOP) data etc fonts ] ;
|
||||
local fontDir = [ FDirName $(HAIKU_TOP) data system data fonts ] ;
|
||||
local psFonts = [ Glob $(fontDir)/psfonts : *.afm *.pfb ] ;
|
||||
local ttFonts = [ Glob $(fontDir)/ttfonts : *.ttf ] ;
|
||||
AddFilesToHaikuImage system fonts psfonts : $(psFonts) ;
|
||||
AddFilesToHaikuImage system fonts ttfonts : $(ttFonts) ;
|
||||
AddFilesToHaikuImage system data fonts psfonts : $(psFonts) ;
|
||||
AddFilesToHaikuImage system data fonts ttfonts : $(ttFonts) ;
|
||||
|
||||
local cannaDir = [ FDirName $(HAIKU_TOP) data system data Canna ] ;
|
||||
local cannaDefault = [ Glob $(cannaDir)/default : *.canna *.gz ] ;
|
||||
|
|
|
@ -39,7 +39,7 @@ static const char *kSystemDirectories[] = {
|
|||
SYSTEM, // B_BEOS_SYSTEM_DIRECTORY
|
||||
SYSTEM "/add-ons",
|
||||
SYSTEM "/boot",
|
||||
SYSTEM "/fonts",
|
||||
SYSTEM "/data/fonts",
|
||||
SYSTEM "/lib",
|
||||
SYSTEM "/servers",
|
||||
SYSTEM "/apps",
|
||||
|
@ -64,7 +64,7 @@ static const char *kCommonDirectories[] = {
|
|||
COMMON "", // B_COMMON_SYSTEM_DIRECTORY
|
||||
COMMON "/add-ons",
|
||||
COMMON "/boot",
|
||||
COMMON "/fonts",
|
||||
COMMON "/data/fonts",
|
||||
COMMON "/lib",
|
||||
COMMON "/servers",
|
||||
COMMON "/bin",
|
||||
|
@ -91,7 +91,7 @@ static const char *kUserDirectories[] = {
|
|||
HOME "/config", // B_USER_CONFIG_DIRECTORY
|
||||
HOME "/config/add-ons",
|
||||
HOME "/config/boot",
|
||||
HOME "/config/fonts",
|
||||
HOME "/config/data/fonts",
|
||||
HOME "/config/lib",
|
||||
HOME "/config/settings",
|
||||
HOME "/config/be",
|
||||
|
|
Loading…
Reference in New Issue