X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=mk%2Fjam%2Fsubdir.jam;h=fa613095a9a2830b61061acdbe090a21be05a869;hb=cec03bef2b77059bee5a524f3779bc724c113eab;hp=bb1ba507384ea9ce0cf159818eec63fe4f1dd03c;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git

diff --git a/mk/jam/subdir.jam b/mk/jam/subdir.jam
index bb1ba5073..fa613095a 100644
--- a/mk/jam/subdir.jam
+++ b/mk/jam/subdir.jam
@@ -3,9 +3,9 @@
 #	(until jampeople accept my patches :-/ )
 #============================================================================
 
-LOCATE_OBJECTS ?= $(top_builddir)/out/$(target) ;
+LOCATE_OBJECTS ?= $(top_builddir)/build/$(target) ;
 LOCATE_TARGETS ?= $(top_builddir) ;
-LOCATE_DOCS ?= $(top_builddir)/out ;
+LOCATE_DOCS ?= $(top_builddir)/build ;
 
 SUBDIRRULES += FixSubDirPath ;
 
@@ -16,6 +16,9 @@ rule FixSubDirPath
 {
     LOCATE_SOURCE = [ ConcatDirs $(LOCATE_OBJECTS) $(SUBDIR_TOKENS) ] ;
     LOCATE_TARGET = [ ConcatDirs $(LOCATE_OBJECTS) $(SUBDIR_TOKENS) ] ;
+
+    # We need to package the Jamfile (a bit hacky here...)
+    Package Jamfile ;
 }
 
 # fix bug in Jambase where SubInclude in the middle of a jam file made it break