[haiku-commits] r33985 - in haiku/trunk: build/jam src/data src/data/etc src/data/keymaps src/data/timezones ...

From: axeld@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 10 Nov 2009 15:21:27 +0100 (CET)
Author: axeld
Date: 2009-11-10 15:21:27 +0100 (Tue, 10 Nov 2009)
New Revision: 33985
Changeset: http://dev.haiku-os.org/changeset/33985/haiku

Modified:
   haiku/trunk/build/jam/HelperRules
   haiku/trunk/src/data/Jamfile
   haiku/trunk/src/data/etc/Jamfile
   haiku/trunk/src/data/keymaps/Jamfile
   haiku/trunk/src/data/timezones/Jamfile
   haiku/trunk/src/servers/input/Jamfile
Log:
* Build fix of the timezone/keymap move. Sorry!


Modified: haiku/trunk/build/jam/HelperRules
===================================================================
--- haiku/trunk/build/jam/HelperRules   2009-11-10 13:48:56 UTC (rev 33984)
+++ haiku/trunk/build/jam/HelperRules   2009-11-10 14:21:27 UTC (rev 33985)
@@ -109,7 +109,7 @@
                local binaries = [ on $(source) return $(TZ_OBJECTS) ] ;
 
                local targetDir = [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR)
-                       data etc timezones ] ;
+                       data timezones ] ;
 
                local binary ;
                for binary in $(binaries) {

Modified: haiku/trunk/src/data/Jamfile
===================================================================
--- haiku/trunk/src/data/Jamfile        2009-11-10 13:48:56 UTC (rev 33984)
+++ haiku/trunk/src/data/Jamfile        2009-11-10 14:21:27 UTC (rev 33985)
@@ -1,3 +1,5 @@
 SubDir HAIKU_TOP src data ;
 
-SubInclude HAIKU_TOP src data etc ;
+HaikuSubInclude etc ;
+HaikuSubInclude keymaps ;
+HaikuSubInclude timezones ;

Modified: haiku/trunk/src/data/etc/Jamfile
===================================================================
--- haiku/trunk/src/data/etc/Jamfile    2009-11-10 13:48:56 UTC (rev 33984)
+++ haiku/trunk/src/data/etc/Jamfile    2009-11-10 14:21:27 UTC (rev 33985)
@@ -12,7 +12,3 @@
 MakeLocateArch $(sysless) ;
 Depends $(sysless) : $(syslessIn) ;
 LessKey $(sysless) : $(syslessIn) ;
-
-
-SubInclude HAIKU_TOP src data etc keymaps ;
-SubInclude HAIKU_TOP src data etc timezones ;

Modified: haiku/trunk/src/data/keymaps/Jamfile
===================================================================
--- haiku/trunk/src/data/keymaps/Jamfile        2009-11-10 13:48:56 UTC (rev 
33984)
+++ haiku/trunk/src/data/keymaps/Jamfile        2009-11-10 14:21:27 UTC (rev 
33985)
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src data etc keymaps ;
+SubDir HAIKU_TOP src data keymaps ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 

Modified: haiku/trunk/src/data/timezones/Jamfile
===================================================================
--- haiku/trunk/src/data/timezones/Jamfile      2009-11-10 13:48:56 UTC (rev 
33984)
+++ haiku/trunk/src/data/timezones/Jamfile      2009-11-10 14:21:27 UTC (rev 
33985)
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src data etc timezones ;
+SubDir HAIKU_TOP src data timezones ;
 
 NotFile timezone_files ;
 Depends files : timezone_files ;

Modified: haiku/trunk/src/servers/input/Jamfile
===================================================================
--- haiku/trunk/src/servers/input/Jamfile       2009-11-10 13:48:56 UTC (rev 
33984)
+++ haiku/trunk/src/servers/input/Jamfile       2009-11-10 14:21:27 UTC (rev 
33985)
@@ -25,8 +25,7 @@
 
 MkKeymapHeader [ FGristFiles SystemKeymap.h ] : US-International.keymap ;
 
-SEARCH on US-International.keymap
-         += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) data etc keymaps ] ;
+SEARCH on US-International.keymap += [ FDirName $(HAIKU_TOP) src data keymaps 
] ;
 
 AddResources input_server : input_server.rdef ;
[haiku-commits] r33985 - in haiku/trunk: build/jam src/data src/data/etc src/data/keymaps src/data/timezones ...

Other related posts:
