i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Build fix of the timezone/keymap move. Sorry!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33985 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-11-10 14:21:27 +00:00
parent 3578c56a15
commit 3734adc5b3
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HelperRules
+1 -1
View File
@@ -109,7 +109,7 @@ rule FTimeZoneBinaries
local binaries = [ on $(source) return $(TZ_OBJECTS) ] ; local binaries = [ on $(source) return $(TZ_OBJECTS) ] ;
local targetDir = [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) local targetDir = [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR)
data etc timezones ] ; data timezones ] ;
local binary ; local binary ;
for binary in $(binaries) { for binary in $(binaries) {
src/data/Jamfile
+3 -1
View File
@@ -1,3 +1,5 @@
SubDir HAIKU_TOP src data ; SubDir HAIKU_TOP src data ;
SubInclude HAIKU_TOP src data etc ; HaikuSubInclude etc ;
HaikuSubInclude keymaps ;
HaikuSubInclude timezones ;
src/data/etc/Jamfile
-4
View File
@@ -12,7 +12,3 @@ local sysless = <etc>sysless ;
MakeLocateArch $(sysless) ; MakeLocateArch $(sysless) ;
Depends $(sysless) : $(syslessIn) ; Depends $(sysless) : $(syslessIn) ;
LessKey $(sysless) : $(syslessIn) ; LessKey $(sysless) : $(syslessIn) ;
SubInclude HAIKU_TOP src data etc keymaps ;
SubInclude HAIKU_TOP src data etc timezones ;
src/data/keymaps/Jamfile
+1 -1
View File
@@ -1,4 +1,4 @@
SubDir HAIKU_TOP src data etc keymaps ; SubDir HAIKU_TOP src data keymaps ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
src/data/timezones/Jamfile
+1 -1
View File
@@ -1,4 +1,4 @@
SubDir HAIKU_TOP src data etc timezones ; SubDir HAIKU_TOP src data timezones ;
NotFile timezone_files ; NotFile timezone_files ;
Depends files : timezone_files ; Depends files : timezone_files ;
src/servers/input/Jamfile
+1 -2
View File
@@ -25,8 +25,7 @@ actions MkKeymapHeader1 {
MkKeymapHeader [ FGristFiles SystemKeymap.h ] : US-International.keymap ; MkKeymapHeader [ FGristFiles SystemKeymap.h ] : US-International.keymap ;
SEARCH on US-International.keymap SEARCH on US-International.keymap += [ FDirName $(HAIKU_TOP) src data keymaps ] ;
+= [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) data etc keymaps ] ;
AddResources input_server : input_server.rdef ; AddResources input_server : input_server.rdef ;