rpms/openoffice.org/devel workspace.targetedaot.patch,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30563

Modified Files:
	workspace.targetedaot.patch 
Log Message:
see if that'll work

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 config_office/configure.in                   |   59 +++++++++++++++++----------
 config_office/set_soenv.in                   |    7 ---
 filter/source/config/fragments/makefile.mk   |    4 +
 filter/source/config/tools/merge/makefile.mk |    3 +
 helpcontent2/util/target.pmk                 |    5 +-
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/settings.mk                       |    5 --
 solenv/inc/target.mk                         |    6 ++
 solenv/inc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +
 20 files changed, 75 insertions(+), 51 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.targetedaot.patch	22 Apr 2006 18:11:49 -0000	1.6
+++ workspace.targetedaot.patch	22 Apr 2006 18:29:31 -0000	1.7
@@ -141,7 +141,7 @@
 diff -u -r1.17 makefile.mk
 --- openoffice.org.orig/filter/source/config/fragments/makefile.mk	16 Mar 2006 11:08:21 -0000	1.17
 +++ openoffice.org/filter/source/config/fragments/makefile.mk	22 Apr 2006 16:28:44 -0000
-@@ -155,7 +155,11 @@
+@@ -155,5 +155,9 @@
  #cmc, hack to workaround the java build requirement
  MERGE:=python ../tools/merge/pyAltFCFGMerge
  .ELSE
@@ -150,9 +150,7 @@
 +.ELSE
  MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
 +.ENDIF
- .IF "$(JDK)" == "gcj"
- XALANCLASS=$(SOLARBINDIR)/xalan.jar
- CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
+ XALAN_JAR*=$(SOLARBINDIR)$/xalan.jar
 Index: source/config/tools/merge/makefile.mk
 ===================================================================
 RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v