openoffice-jvmaccess-handle-no-solar-java.patch

   1 --- jvmaccess/source/makefile.mk.orig   2003-09-22 12:40:14.000000000 -0700
   2 +++ jvmaccess/source/makefile.mk        2003-09-22 12:41:58.000000000 -0700
   3 @@ -67,6 +67,8 @@
   4
   5  .INCLUDE: settings.mk
   6
   7 +.IF "$(SOLAR_JAVA)"!=""
   8 +
   9  UNOTYPES= com.sun.star.uno.TypeClass com.sun.star.uno.XInterface
  10
  11  UNOUCRDEP = $(SOLARBINDIR)$/udkapi.rdb
  12 @@ -80,4 +82,6 @@
  13      $(SLO)$/virtualmachine.obj \
  14      $(SLO)$/windows.obj
  15
  16 +.ENDIF # "$(SOLAR_JAVA)"!=""
  17 +
  18  .INCLUDE: target.mk
  19 --- jvmaccess/util/makefile.mk.orig     2003-09-22 12:40:19.000000000 -0700
  20 +++ jvmaccess/util/makefile.mk  2003-09-22 12:41:35.000000000 -0700
  21 @@ -71,6 +71,8 @@
  22
  23  .INCLUDE: settings.mk
  24
  25 +.IF "$(SOLAR_JAVA)"!=""
  26 +
  27  .IF "$(UNIXVERSIONNAMES)" == ""
  28  SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
  29  .ELSE # UNIXVERSIONNAMES
  30 @@ -96,4 +98,6 @@
  31
  32  DEF1NAME = $(SHL1TARGET)
  33
  34 +.ENDIF # "$(SOLAR_JAVA)"!=""
  35 +
  36  .INCLUDE: target.mk