From eafc145658b00bb4e49967e7f24d06e9fce46ea4 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 19 Aug 2008 09:21:04 +0000 Subject: [PATCH] INTEGRATION: CWS dba31a (1.5.22); FILE MERGED 2008/07/03 06:51:20 oj 1.5.22.2: handling for config files corrected 2008/07/01 07:02:17 oj 1.5.22.1: #i77916# impl zoom and move config data into ext --- reportdesign/util/makefile.pmk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/reportdesign/util/makefile.pmk b/reportdesign/util/makefile.pmk index ed29885da36f..87409c959047 100644 --- a/reportdesign/util/makefile.pmk +++ b/reportdesign/util/makefile.pmk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # # This file is part of OpenOffice.org. # @@ -30,12 +30,16 @@ #************************************************************************* XSLDIR=$(SOLARXMLDIR)$/processing -XCSROOT=$(SOLARXMLDIR) -ABSXCSROOT=$(SOLARXMLDIR) +ABSXCSROOT=$(PWD)$/$(MISC)$/$(EXTNAME) +# ABSXCSROOT=$(MISC)$/$(EXTNAME) +XCSROOT=.. +# XCSROOT=$(SOLARXMLDIR) +# ABSXCSROOT=$(SOLARXMLDIR) DTDDIR=$(SOLARXMLDIR) PROCESSOUT=$(MISC)$/$(EXTNAME) PROCESSORDIR=$(SOLARBINDIR) + # no validation by inspector class NO_INSPECTION=TRUE