* Moved teapod.data from /etc to B_SYSTEM_DATA_DIRECTORY.

* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33975 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-10 11:08:14 +00:00
parent 9e81ddee87
commit 126fd25b7a
3 changed files with 81 additions and 76 deletions
+6 -1
View File
@@ -388,7 +388,7 @@ local languageDir = [ FDirName $(HAIKU_TOP) src data etc locale languages ] ;
local languages = [ Glob $(languageDir) : *.language ] ;
AddFilesToHaikuImage system data locale languages : $(languages) ;
local etcFiles = bash_completion inputrc profile teapot.data ;
local etcFiles = bash_completion inputrc profile ;
etcFiles = $(etcFiles:G=etc) ;
SEARCH on $(etcFiles) = [ FDirName $(HAIKU_TOP) data etc ] ;
etcFiles += <etc>termcap <etc>sysless <etc>sysless.in ;
@@ -401,6 +401,11 @@ AddFilesToHaikuImage system etc bash_completion.d : <bash_completion>subversion
SEARCH on <etc>vimrc = [ FDirName $(HAIKU_TOP) data etc vim ] ;
AddFilesToHaikuImage system etc vim : <etc>vimrc ;
local dataFiles = teapot.data ;
dataFiles = $(dataFiles:G=data) ;
SEARCH on $(dataFiles) = [ FDirName $(HAIKU_TOP) data ] ;
AddFilesToHaikuImage system data : $(dataFiles) ;
local fortuneFiles = Art Computers Education Food Fortunes Goedel Haiku
Humorists Kids Law "Linux cookies" Love Magic Medicine Miscellaneous
News "One Liners" "OS Fortunes" Pets Platitudes Riddles "Songs & Poems"
+1 -1
View File
@@ -165,7 +165,7 @@ ObjectView::ObjectView(BRect rect, char *name, ulong resizingMode, ulong options
drawEvent = create_sem(0, "draw event");
char findDir[PATH_MAX];
find_directory(B_BEOS_ETC_DIRECTORY, -1, true, findDir, PATH_MAX);
find_directory(B_SYSTEM_DATA_DIRECTORY, -1, true, findDir, PATH_MAX);
sprintf(teapotPath, "%s/%s", findDir, teapotData);
fObjListLock.Lock();
fObjects.AddItem(new TriangleObject(this, teapotPath));