diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:24 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:24 +0200 |
| commit | e0785dd388faf57cd20bf3bb13a28ffc410911ef (patch) | |
| tree | c833c1cc1e912f862d9555c6faa41e1ccc08be66 /berkeleydb | |
| parent | ebed352d9e51f8e57e7bc28454f41dec12b31dbd (diff) | |
| parent | dc715ad0d597924e1a6b524c888c85112f9df159 (diff) | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
python/makefile.mk
zlib/makefile.mk
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 84d7e0b231eb..98c8a5ec16bd 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -94,7 +94,7 @@ CONFIGURE_DIR=out #relative to CONFIGURE_DIR CONFIGURE_ACTION= \ ..$/dist$/configure -CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 CC='$(CC) $(SOLARLIB)' .IF "$(OS)"=="MACOSX" CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" .ENDIF |