diff options
| author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-12-13 12:24:22 +0100 |
|---|---|---|
| committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-12-13 12:24:22 +0100 |
| commit | 0fef73130574c0c703f248d848fa8c339d7b6991 (patch) | |
| tree | 1d9a8196acfbf8aacb807bc7757c6e29f9b0368a /moz | |
| parent | d9172015d263ca161ff0439263ccc2590678ed6b (diff) | |
Better workaround for multiple sqlite conflict (see module nss/prj/d.lst).
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/prj/d.lst | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/moz/prj/d.lst b/moz/prj/d.lst index 2ecfab53df91..df08e6be4371 100644 --- a/moz/prj/d.lst +++ b/moz/prj/d.lst @@ -237,7 +237,20 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete ..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib ..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete +..\%__SRC%\lib\libldap50.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libmozjs.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libmozz.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libprldap50.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% + mkdir: %_DEST%\lib%_EXT%\sqlite -..\%__SRC%\lib\libsqlite3* %_DEST%\lib%_EXT%\sqlite -..\%__SRC%\lib\* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite + ..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT% |