Changing Makefile for new default dictionaries

git-svn-id: file:///svnroot/mdictionary/trunk@146 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/Makefile b/Makefile
index dfcf029..3920c1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,9 +68,9 @@ MNG_LIB = ${BINARIES}/ws_bookmark.so
 MNG_DIRS = ${DESTDIR}/usr/bin ${DESTDIR}/usr/lib/WhiteStork ${DESTDIR}/usr/share/dbus-1/services  ${DESTDIR}/usr/share/WhiteStork ${DESTDIR}/usr/share/doc/${MNG_PACK_NAME}
 MNG_DBUS = ${DATA}/other/${MNG_SERVICEFILE}
 MNG_OTHER = ${DATA}/dictionaries 
-MNG_DICT1 = ${DATA}/dictionaries/elements/dict.cache ${DATA}/dictionaries/elements/dict.xdxf ${DESTDIR}/usr/share/WhiteStork/dictionaries/elements/
-MNG_DICT2 = ${DATA}/dictionaries/us-en/dict.xdxf ${DESTDIR}/usr/share/WhiteStork/dictionaries/us-en/
-MNG_DICT_DIRS = ${DESTDIR}/usr/share/WhiteStork/dictionaries/elements/ ${DESTDIR}/usr/share/WhiteStork/dictionaries/us-en/
+MNG_DICT1 = ${DATA}/dictionaries/StarDictSampleDict/sample.dict.dz ${DATA}/dictionaries/StarDictSampleDict/sample.idx ${DATA}/dictionaries/StarDictSampleDict/sample.ifo ${DESTDIR}/usr/share/WhiteStork/dictionaries/StarDictSampleDict/
+MNG_DICT2 = ${DATA}/dictionaries/XDXFSampleDict/dict.xdxf ${DESTDIR}/usr/share/WhiteStork/dictionaries/XDXFSampleDict/
+MNG_DICT_DIRS = ${DESTDIR}/usr/share/WhiteStork/dictionaries/StarDictSampleDict/ ${DESTDIR}/usr/share/WhiteStork/dictionaries/XDXFSampleDict/
 MNG_BOOKMARKS = ${DATA}/bookmarks/${BOOKMARKS}/*
 MNG_DOC = ${DATA}/docs/${MNG_PACK_NAME}/
 
@@ -238,7 +238,7 @@ clean-temp:
                @-fakeroot rm -f /usr/lib/WhiteStork/engine_xdxf.so
                @-fakeroot rm -f /usr/lib/WhiteStork/engine_stardict.so
 
-               gconftool-2 --recursive-unset /apps/maemo/WhiteStork
+#              gconftool-2 --recursive-unset /apps/maemo/WhiteStork
 
 install-manager: localization ${BINARIES}/ws_dbus.o  ${BINARIES}/ws_bookmark.so ${BINARIES}/WhiteStorkManager
                @install -d ${MNG_DIRS}
@@ -277,14 +277,14 @@ install:  install-manager install-gui install-plugins
                @echo -e "\n\nIf you are installing whitestork, please run 'make entries', before running the application ( not as root )\n\n"
 
 entries:       
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/elements/name "Elements Database"
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/elements/path "/usr/share/WhiteStork/dictionaries/elements"
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/elements/active true
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/elements/optimized true
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/us-en/name "American - English Dictionary"
-               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/us-en/path "/usr/share/WhiteStork/dictionaries/us-en"
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/us-en/active true
-               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/us-en/optimized false
+               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/StarDictSampleDict/name "Polish - English Sample Dictionary"
+               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/StarDictSampleDict/path "/usr/share/WhiteStork/dictionaries/StarDictSampleDict"
+               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/StarDictSampleDict/active true
+               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/StarDictSampleDict/optimized false
+               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/XDXFSampleDict/name "English - Polish Sample Dictionary"
+               gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/XDXFSampleDict/path "/usr/share/WhiteStork/dictionaries/XDXFSampleDict"
+               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/XDXFSampleDict/active true
+               gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/XDXFSampleDict/optimized false
                
                gconftool-2 --type string --set /apps/maemo/WhiteStork/Engines/bookmarks/path "/usr/lib/WhiteStork/ws_bookmark.so"
                gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/bookmarks/name "Bookmarks"