X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Jamrules;h=4dfca553b469efc8c0d9183111ebd8a608a42eac;hb=665b4a4a6b0edae82fb830528f16d2176da44aa4;hp=3213e5db005deb6093c1594b3292a8a2f39d4074;hpb=eba5f4b45f92cb19a09fbac1a478648062480adb;p=supertux.git

diff --git a/Jamrules b/Jamrules
index 3213e5db0..4dfca553b 100644
--- a/Jamrules
+++ b/Jamrules
@@ -4,6 +4,9 @@ if ! $(top_builddir)
 }
 top_srcdir = $(TOP) ;
 
+# unset some stuff defined in Jambase
+LEX = ;
+
 JAMCONFIG ?= $(top_builddir)/Jamconfig ;
 include $(JAMCONFIG) ;
 if ! $(JAMCONFIG_READ)
@@ -43,19 +46,35 @@ include $(TOP)/mk/jam/build.jam ;
 
 # Include Dirs
 IncludeDir $(top_builddir) ; # for config.h
-IncludeDir lib src ;
+IncludeDir $(top_srcdir)/src ;
+
+actions quietly Append
+{
+  echo $(>) >> $(<) ;
+}
+
+rule DumpVar
+{
+  for FILE in $(>)
+  {
+    Append $(<) : $(FILE) ;
+  }
+  Depends $(<) : $(>) ;
+}
 
 if $(XGETTEXT) != ""
 {
     actions XGetText
     {
-        $(XGETTEXT) $(XGETTEXT_FLAGS) --keyword='_:1' -o $(<) $(>)
+        $(XGETTEXT) $(XGETTEXT_FLAGS) -o $(<) -f $(>)
     }
     rule MakePot
     {
       if $(>) {
-        XGetText $(<) : $(>) ;
-        Depends $(<) : $(>) ;
+        DumpVar $(<).in : $(>) ;
+        XGetText $(<) : $(<).in ;
+        RmTemps $(<) : $(<).in ;
+        Depends $(<) : $(<).in ;
         Depends all : $(<) ;
       }
     }
@@ -63,4 +82,3 @@ if $(XGETTEXT) != ""
     rule MakePot
     { }
 }
-