]> git.pld-linux.org Git - packages/libreoffice.git/blob - openoffice-berkeleydb-handle-no-solar-java.patch
- DON'T hardcode java paths!
[packages/libreoffice.git] / openoffice-berkeleydb-handle-no-solar-java.patch
1 --- berkeleydb/makefile.mk.orig 2003-08-07 20:01:59.000000000 -0700
2 +++ berkeleydb/makefile.mk      2003-08-07 20:04:49.000000000 -0700
3 @@ -80,7 +80,10 @@
4  CONFIGURE_DIR=out
5  #relative to CONFIGURE_DIR
6  CONFIGURE_ACTION=..$/dist$/configure
7 -CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared
8 +CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared
9 +.IF "$(SOLAR_JAVA)"!=""
10 +CONFIGURE_FLAGS+=--enable-java
11 +.ENDIF
12  
13  BUILD_DIR=$(CONFIGURE_DIR)
14  .IF "$(OS)"=="IRIX"
15 @@ -92,7 +95,9 @@
16  
17  OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
18  
19 +.IF "$(SOLAR_JAVA)"!=""
20  OUT2BIN=java$/classes$/db.jar
21 +.ENDIF
22  
23  .ENDIF                 # "$(GUI)"=="UNX"
24  
25 @@ -129,7 +134,9 @@
26         include$/db_185.h \
27         include$/db_cxx.h
28  
29 +.IF "$(SOLAR_JAVA)"!=""
30  OUT2CLASS=java$/classes$/db.jar
31 +.ENDIF
32  
33  # --- Targets ------------------------------------------------------
34  
This page took 0.038587 seconds and 3 git commands to generate.