rpms/openoffice.org/devel workspace.targetedaot.patch,1.9,1.10

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	workspace.targetedaot.patch 
Log Message:
tum to tum

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                 |   10 ++++
 inc/antsettings.mk                           |    0 
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 --------
 solenv/inc/antsettings.mk                    |    8 ---
 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 +
 22 files changed, 81 insertions(+), 58 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- workspace.targetedaot.patch	23 Apr 2006 13:45:10 -0000	1.9
+++ workspace.targetedaot.patch	24 Apr 2006 11:52:36 -0000	1.10
@@ -175,15 +175,22 @@
 diff -u -r1.13 target.pmk
 --- openoffice.org.orig/helpcontent2/util/target.pmk	16 Mar 2006 11:10:20 -0000	1.13
 +++ openoffice.org/helpcontent2/util/target.pmk	22 Apr 2006 16:37:36 -0000
-@@ -50,5 +50,8 @@
+@@ -48,7 +48,15 @@
+ JAVA_VM_HEAP_SIZE = -Xms256m -Xmx256m
+ .ENDIF
  
++.IF "$(JAVAAOTCOMPILER)" != ""
++CLASSPATH!:=$(my_cp)
++.EXPORT : CLASSPATH
++.ENDIF
++
  $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
  	@+-$(MKDIR) -p $(@:d)
-+.IF "$(JAVAAOTCOMPILER)" == ""
++.IF "$(JAVAAOTCOMPILER)" != ""
++	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
++.ELSE
  	$(JAVAI) $(JAVA_VM_HEAP_SIZE) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 -
-+.ELSE
-+	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 +.ENDIF
 Index: bin/deliver.pl
 ===================================================================