GNOME.org
 

ooo-build r14300 - in branches/ooo-build-3-0: . patches/dev300

Author: rengelhard
Date: Mon Oct 13 17:27:33 2008
New Revision: 14300
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14300&view=rev

Log:
2008-10-13  Rene Engelhard  <rene debian org>

        * patches/dev300/xmlhelp-system-lucene-fix.diff,
          patches/dev300/extensions-system-java.diff: don't hardcode
          unxlngx6.pro


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff
   branches/ooo-build-3-0/patches/dev300/xmlhelp-system-lucene-fix.diff

Modified: branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/extensions-system-java.diff	Mon Oct 13 17:27:33 2008
@@ -20,11 +20,11 @@
  
 +fix_system_jfreereport:
 +	@echo "Fix Java Class-Path entry for JFree JFreeReport libraries from system."
-+	@$(SED) '/flute/,/sac/d' -i ../../../../../../unxlngx6.pro/class/sun-report-builder/META-INF/MANIFEST.MF
++	@$(SED) '/flute/,/sac/d' -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
 +	@$(SED) -r -e "s#^Class-Path.*#\0\n  file://$(JCOMMON_JAR)\n  file://$(SAC_JAR)\n  file://$(LIBXML_JAR)\n\
 +  file://$(FLUTE_JAR)\n  file://$(JFREEREPORT_JAR)\n  file://$(LIBLAYOUT_JAR)\n  file://$(LIBLOADER_JAR)\n  file://$(LIBFORMULA_JAR)\n\
 +  file://$(LIBREPOSITORY_JAR)\n  file://$(LIBFONTS_JAR)\n  file://$(JCOMMON_SERIALIZER_JAR)#" \
-+	-i ../../../../../../unxlngx6.pro/class/sun-report-builder/META-INF/MANIFEST.MF
++	-i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
 +
  $(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
  	@@-$(MKDIRHIER) $(@:d)

Modified: branches/ooo-build-3-0/patches/dev300/xmlhelp-system-lucene-fix.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/xmlhelp-system-lucene-fix.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/xmlhelp-system-lucene-fix.diff	Mon Oct 13 17:27:33 2008
@@ -20,4 +20,4 @@
 +fix_system_lucene:
 +	@echo "Fix Java Class-Path entry for Lucene libraries from system."
 +	@$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
-+	-i ../../../../../unxlngx6.pro/class/HelpLinker/META-INF/MANIFEST.MF
++	-i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]