[haiku-commits] r33981 - in haiku/trunk: build/jam data/etc data/system/data src/system/libroot/os
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 10 Nov 2009 13:30:06 +0100 (CET)
Author: axeld
Date: 2009-11-10 13:30:06 +0100 (Tue, 10 Nov 2009)
New Revision: 33981
Changeset: http://dev.haiku-os.org/changeset/33981/haiku
Added:
haiku/trunk/data/system/data/fonts/
Removed:
haiku/trunk/data/etc/fonts/
Modified:
haiku/trunk/build/jam/HaikuImage
haiku/trunk/src/system/libroot/os/find_directory.c
Log:
* Moved the "fonts" directory into the "data" directory.
* Moved fonts to where they belong.
Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage 2009-11-10 12:20:26 UTC (rev 33980)
+++ haiku/trunk/build/jam/HaikuImage 2009-11-10 12:30:06 UTC (rev 33981)
@@ -414,11 +414,11 @@
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 ] ;
Modified: haiku/trunk/src/system/libroot/os/find_directory.c
===================================================================
--- haiku/trunk/src/system/libroot/os/find_directory.c 2009-11-10 12:20:26 UTC
(rev 33980)
+++ haiku/trunk/src/system/libroot/os/find_directory.c 2009-11-10 12:30:06 UTC
(rev 33981)
@@ -39,7 +39,7 @@
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 @@
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 @@
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",
Other related posts:
