From 75f29d7c80bbdf7ce3e595bf62647971d891fc27 Mon Sep 17 00:00:00 2001
From: Release Engineers <releng@openoffice.org>
Date: Fri, 17 Jul 2009 12:47:25 +0000
Subject: #i10000# #i103467# build fix

---
 connectivity/makefile.pmk                     |  4 +++-
 connectivity/source/drivers/mozab/makefile.mk | 30 +++++----------------------
 connectivity/target.pmk                       |  7 +++++--
 3 files changed, 13 insertions(+), 28 deletions(-)

(limited to 'connectivity')

diff --git a/connectivity/makefile.pmk b/connectivity/makefile.pmk
index 4a8dbdf6059d..ede06e49d391 100755
--- a/connectivity/makefile.pmk
+++ b/connectivity/makefile.pmk
@@ -55,8 +55,10 @@ JAVAPREPRO=$(JAVAPREPRO) + " -product"
 PACKAGE=org.openoffice.Office.DataAccess
 .INCLUDE :  settings.mk
 
+COMPONENT_CONFIG_DATA*=$(TARGET).xcu
+
 LOCALIZEDFILES= \
-    $(TARGET).xcu
+    $(COMPONENT_CONFIG_DATA)
 
 XCUFILES= \
     $(LOCALIZEDFILES) \
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index d8171716808c..6240ed041047 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -83,6 +83,11 @@ USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 VISIBILITY_HIDDEN=TRUE
 
+.IF "$(OS)"!="WNT" 
+COMPONENT_CONFIG_DATA=$(TARGET)2.xcu
+COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
+.ENDIF
+
 # --- Settings ----------------------------------
 
 .IF "$(DBGUTIL_OJ)"!=""
@@ -94,24 +99,10 @@ ENVCFLAGS+=/FR$(SLO)$/
 .INCLUDE :  $(PRJ)$/version.mk
 
 # --- Files -------------------------------------
-# redefine because win and linux differ
-.IF "$(OS)"=="WNT" 
-LOCALIZEDFILES= \
-    $(TARGET).xcu
-.ELSE
-LOCALIZEDFILES= \
-    $(TARGET)2.xcu
-.ENDIF
-
-XCUFILES= \
-    $(LOCALIZEDFILES) \
-
-
 
 SLOFILES=\
         $(SLO)$/MDriver.obj						\
         $(SLO)$/MServices.obj
-
             
 # --- MOZAB BASE Library -----------------------------------
 
@@ -202,17 +193,6 @@ DEF2NAME=	$(SHL2TARGET)
 
 .INCLUDE : $(PRJ)$/target.pmk
 
-.IF "$(GUI)"=="WNT" 
-.ELSE
-ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET)2.xcs" "$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET).xcu"
-"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET)2.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-"$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET).xcu" : "$(PWD)$/$(MISC)$/registry$/data$/$(PACKAGEDIR)$/$(TARGET)2.xcu" 
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-.ENDIF
-
 # --- filter file ------------------------------
 
 $(MISC)$/$(SHL1TARGET).flt: makefile.mk
diff --git a/connectivity/target.pmk b/connectivity/target.pmk
index 8d6dedaf7927..97ef318b5feb 100755
--- a/connectivity/target.pmk
+++ b/connectivity/target.pmk
@@ -31,7 +31,10 @@
 
 .INCLUDE : target.mk
 
-ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET).xcs"
-"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(TARGET).xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
+COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs
+
+ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)"
+"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
+
-- 
cgit