]>
Commit | Line | Data |
---|---|---|
eaaa3b8d | 1 | diff -Nur oo/berkeleydb/makefile.mk oo.new/berkeleydb/makefile.mk |
2 | --- oo/berkeleydb/makefile.mk Fri Feb 8 16:18:17 2002 | |
3 | +++ oo.new/berkeleydb/makefile.mk Sun Apr 14 23:56:12 2002 | |
7ddec183 | 4 | @@ -117,12 +117,12 @@ |
5 | ||
6 | .INCLUDE : set_ext.mk | |
7 | .INCLUDE : target.mk | |
8 | -.INCLUDE : tg_ext.mk | |
9 | +#.INCLUDE : tg_ext.mk | |
10 | ||
11 | -TG_DELIVER : $(INPATH)$/misc$/build$/so_predeliver | |
12 | - $(DELIVER) | |
13 | +#TG_DELIVER : $(INPATH)$/misc$/build$/so_predeliver | |
14 | +# $(DELIVER) | |
15 | ||
16 | -.IF "$(BUILD_SOSL)"!="" | |
17 | -ALLTAR : TG_DELIVER | |
18 | -.ENDIF # "$(BUILD_SOSL)"!="" | |
19 | +#.IF "$(BUILD_SOSL)"!="" | |
20 | +#ALLTAR : TG_DELIVER | |
21 | +#.ENDIF # "$(BUILD_SOSL)"!="" | |
22 | ||
eaaa3b8d | 23 | diff -Nur oo/config_office/makefile.rc oo.new/config_office/makefile.rc |
24 | --- oo/config_office/makefile.rc Fri Oct 19 17:25:23 2001 | |
25 | +++ oo.new/config_office/makefile.rc Sun Apr 14 23:56:12 2002 | |
d3966d51 | 26 | @@ -155,7 +155,6 @@ |
27 | so3 \ | |
28 | soltools \ | |
29 | sot \ | |
30 | - berkeleydb \ | |
31 | starmath \ | |
32 | stoc \ | |
33 | store \ | |
14e4466f | 34 | diff -Nur oo/solenv/inc/libs.mk oo.new/solenv/inc/libs.mk |
35 | --- oo/solenv/inc/libs.mk Fri Oct 26 15:14:41 2001 | |
36 | +++ oo.new/solenv/inc/libs.mk Mon Apr 15 12:10:25 2002 | |
37 | @@ -169,8 +169,8 @@ | |
38 | ZLIB3RDLIB=-lzlib | |
39 | JPEG3RDLIB=-ljpeglib | |
40 | NEON3RDLIB=-lneon | |
41 | -BERKELEYLIB=-ldb-3.2 | |
42 | -BERKELEYCPPLIB=-ldb_cxx-3.2 | |
43 | +BERKELEYLIB=-ldb-3 | |
44 | +BERKELEYCPPLIB=-ldb_cxx-3 | |
45 | SFX2LIB=-lsfx$(UPD)$(DLLPOSTFIX) | |
46 | SFXLIB=-lsfx$(UPD)$(DLLPOSTFIX) | |
47 | SFXDEBUGLIB= | |
e51b611a | 48 | diff -Nur oo/xmlhelp/source/cxxhelp/provider/databases.cxx oo.new/xmlhelp/source/cxxhelp/provider/databases.cxx |
49 | --- oo/xmlhelp/source/cxxhelp/provider/databases.cxx Fri Nov 23 17:51:01 2001 | |
50 | +++ oo.new/xmlhelp/source/cxxhelp/provider/databases.cxx Mon Apr 15 10:59:50 2002 | |
51 | @@ -60,7 +60,7 @@ | |
52 | ************************************************************************/ | |
53 | ||
54 | ||
55 | -#include <berkeleydb/db_cxx.h> | |
56 | +#include <db_cxx.h> | |
57 | #ifndef _VOS_DIAGNOSE_HXX_ | |
58 | #include <vos/diagnose.hxx> | |
59 | #endif | |
cf9e3ff2 | 60 | diff -Nur oo/xmlhelp/source/cxxhelp/provider/urlparameter.cxx oo.new/xmlhelp/source/cxxhelp/provider/urlparameter.cxx |
61 | --- oo/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Wed Oct 31 14:08:14 2001 | |
62 | +++ oo.new/xmlhelp/source/cxxhelp/provider/urlparameter.cxx Mon Apr 15 11:05:50 2002 | |
63 | @@ -88,7 +88,7 @@ | |
64 | #include <sablot/shandler.h> | |
65 | #endif | |
66 | #ifndef _DB_CXX_H_ | |
67 | -#include <berkeleydb/db_cxx.h> | |
68 | +#include <db_cxx.h> | |
69 | #endif | |
70 | #ifndef _URLPARAMETER_HXX_ | |
71 | #include <provider/urlparameter.hxx> |