Index: prj/d.lst
===================================================================
--- prj/d.lst	(revision 277936)
+++ prj/d.lst	(working copy)
@@ -28,6 +28,6 @@
 ..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
 ..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx
 #..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
+..\%__SRC%\misc\lang\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
 ..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
\ No newline at end of file
+..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
Index: util/makefile.mk
===================================================================
--- util/makefile.mk	(revision 277936)
+++ util/makefile.mk	(working copy)
@@ -47,7 +47,7 @@
 DIR_LANG_SOURCE  := $(MISC)$/registry$/data
 .ENDIF
 DRIVER_MERGE_XCU := $(shell -@$(FIND) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess -name "*.xcu")
-   
+DRIVER_MERGE_DEST = $(MISC)/lang/{$(DRIVER_MERGE_XCU:f)}
 REALFILTERPACKAGES_FILTERS_UI_LANGPACKS = \
     $(foreach,i,$(alllangiso) $(foreach,j,$(DRIVER_MERGE_XCU) $(DIR_LANGPACK)$/$i$/org$/openoffice$/Office$/DataAccess$/$(j:f)))
 
@@ -58,12 +58,12 @@
 PACKLANG_PARAM := --stringparam
 PACKLANG_XSL :=
     
-$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) : 
-      @echo ===================================================================
-      @echo Building language package for driver $(@:b:s/Filter_//) 
-      @echo ===================================================================
-      +-$(MKDIRHIER) $(@:d)
-      $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@
+$(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) : 
+      @echo ===================================================================
+      @echo Building language package for driver $(@:b:s/Filter_//) 
+      @echo ===================================================================
+      +-$(MKDIRHIER) $(@:d)
+      $(PACKLANG) $(PACKLANG_PARAM) lang $(@:d:d:d:d:d:d:d:d:d:d:b) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess$/$(@:f) > $@
 
 $(MISC)$/$(TARGET)_delzip :
 	-$(RM) $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip	
@@ -76,5 +76,26 @@
 
 ALLTAR: \
 	$(MISC)$/$(TARGET)_delzip \
-	$(BIN)$/fcfg_drivers_{$(alllangiso)}.zip
+	$(BIN)$/fcfg_drivers_{$(alllangiso)}.zip \
+    $(MISC)/lastlang.mk
 
+.IF "$(DRIVER_MERGE_DEST)"!=""
+.INCLUDE .IGNORE : $(MISC)/lastlang.mk
+
+ALLTAR : \
+    $(DRIVER_MERGE_DEST)
+
+.IF "$(LAST_LANGS)"!="$(WITH_LANG)"
+DO_PHONY=.PHONY
+.ENDIF          # "$(LAST_LANG)"!="$(WITH_LANG)"
+
+$(MISC)/lang/%.xcu $(DO_PHONY) : $(DIR_LANG_SOURCE)$/org$/openoffice$/Office$/DataAccess/%.xcu
+    @@-$(MKDIRHIER) $(@:d:d)
+    $(COPY) $< $@
+
+.ENDIF          # "$(DRIVER_MERGE_DEST)"!=""
+
+$(MISC)/lastlang.mk $(DO_PHONY) :
+    $(RM) $@
+    echo LAST_LANGS=$(WITH_LANG) > $@
+