Fixed the run Makefile target

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

diff --git a/Makefile b/Makefile
index ba2474d..17a2434 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -217,67 +217,12 @@ clean: clean-logs
 #              @-cd ${STARDICT_PLUGIN} && make clean >> ../../../${LOG_CLEAN} 2>> ../../../${LOG_CLEAN}
 #              @-cd ${BOOKMARKS_DIR} && make clean >> ../../../${LOG_CLEAN} 2>> ../../../${LOG_CLEAN}
 
-run: build-test run-dict clean-temp
+run: clean install entries run-dict clean-temp
 
 
 run-dict:
                @run-standalone.sh WhiteStorkManager
 
-build-test: clean clean-temp build
-               @echo -e -n "Copying needed files to specific directories...\n"
-               @echo -e -n > ${LOG_RUN}
-               @-fakeroot install -d /usr/share/WhiteStork/dictionaries/elements
-               @-fakeroot mkdir /usr/share/WhiteStork/dictionaries/us-en
-               @-fakeroot mkdir /usr/share/WhiteStork/dictionaries/bookmarks
-               @-fakeroot mkdir /usr/lib/WhiteStork
-               @-fakeroot mkdir /usr/include/WhiteStork
-
-               @echo "Copying Manager files"
-               @cp -f ${BINARIES}/WhiteStorkManager /usr/bin/
-               @cp -f ${DATA}/other/org.maemo.WhiteStorkManager.service  /usr/share/dbus-1/services
-               @cp -f ${DATA}/dict1.xdxf /usr/share/WhiteStork/dictionaries/elements/dict.xdxf
-               @cp -f ${DATA}/dict1.cache  /usr/share/WhiteStork/dictionaries/elements/dict.cache
-               @cp -f ${DATA}/dict2.xdxf  /usr/share/WhiteStork/dictionaries/us-en/dict.xdxf
-               
-               @cp -rf ${DATA}/stardict /usr/share/WhiteStork/dictionaries
-
-               @gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/bookmarks/name "Bookmarks"
-               @gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/bookmarks/path "/usr/share/WhiteStork/dictionaries/bookmarks"
-               @gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/bookmarks/active true
-               @gconftool-2 --type string --set /apps/maemo/WhiteStork/Engines/xdxf/path "/usr/lib/WhiteStork/engine_xdxf.so"
-               @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/Engines/stardict/path "/usr/lib/WhiteStork/engine_stardict.so"
-               @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 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 string --set /apps/maemo/WhiteStork/Dictionaries/stardict/name "StarDict"
-               @gconftool-2 --type string --set /apps/maemo/WhiteStork/Dictionaries/stardict/path "/usr/share/WhiteStork/dictionaries/stardict"
-               @gconftool-2 --type bool --set /apps/maemo/WhiteStork/Dictionaries/stardict/active true
-
-               @echo "Copying GUI files"
-               @cp -f ${BINARIES}/WhiteStork /usr/bin/
-               @cp -f ${DATA}/whitestorkgui.desktop /usr/share/applications/hildon/whitestork.desktop
-               @ln -s /usr/share/applications/hildon/whitestork.desktop /etc/others-menu/extra_applications/0112_whitestorkgui.desktop
-               @cp -f ${DATA}/whitestork.png /usr/share/pixmaps
-               @cp -f ${DATA}/icon.png /usr/share/pixmaps/whitestork_icon.png
-               @cp -f ${DATA}/org.maemo.WhiteStorkGui.service /usr/share/dbus-1/services
-               @gconftool-2 --type bool --set /apps/maemo/WhiteStork/configuration/licence true
-               
-               @echo "Copying XDXF Engine files"
-               @cp -f ${BINARIES}/engine_xdxf.so /usr/lib/WhiteStork/
-               @cp -f ${DATA}/engine_xdxf_icon.png /usr/share/pixmaps
-
-               @echo "Copying StarDict Engine files"
-               @cp -f ${BINARIES}/engine_stardict.so /usr/lib/WhiteStork/
-               #@cp -f ${DATA}/engine_stardict_icon.png /usr/share/pixmaps
-               
-               @echo "Copying Bookmark's files"
-               @cp -f ${BINARIES}/ws_bookmark.so /usr/lib/WhiteStork/
-               @cp -f ${DATA}/ws_bookmarks /usr/share/WhiteStork/dictionaries/bookmarks/ws_bookmarks
-
 clean-temp:
                @-fakeroot rm -rf /usr/share/WhiteStork
                @-fakeroot rm -rf /usr/lib/WhiteStork
@@ -294,7 +239,7 @@ clean-temp:
 
                gconftool-2 --recursive-unset /apps/maemo/WhiteStork
 
-install-manager: localization ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStorkManager 
+install-manager: localization ${BINARIES}/ws_dbus.o  ${BINARIES}/ws_bookmark.so ${BINARIES}/WhiteStorkManager
                @install -d ${MNG_DIRS}
                @cp ${MNG_EXECUTABLE} ${DESTDIR}/usr/bin
                @cp ${MNG_LIB} ${DESTDIR}/usr/lib/WhiteStork
@@ -308,7 +253,7 @@ install-manager: localization ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStorkManage
                @install -d ${DESTDIR}/usr/share/WhiteStork/dictionaries/bookmarks
                @cp -rf ${MNG_BOOKMARKS} ${DESTDIR}/usr/share/WhiteStork/dictionaries/bookmarks
                
-install-gui:   ${BINARIES}/ws_bookmark.so ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStork 
+install-gui:   ${BINARIES}/ws_dbus.o ${BINARIES}/WhiteStork 
                @install -d ${GUI_DIRS}
                @cp ${GUI_EXECUTABLE} ${DESTDIR}/usr/bin
                @cp ${GUI_ICONS} ${DESTDIR}/usr/share/pixmaps
@@ -349,7 +294,7 @@ entries:
                gconftool-2 --type string --set /apps/maemo/WhiteStork/Engines/xdxf/path "/usr/lib/WhiteStork/engine_xdxf.so"
                gconftool-2 --type string --set /apps/maemo/WhiteStork/Engines/stardict/path "/usr/lib/WhiteStork/engine_stardict.so"
                
-               maemo-select-menu-location whitestork.desktop
+#              maemo-select-menu-location whitestork.desktop
 
 
 install_deb: clean-inst-log uninstall eng-deb-i mng-deb-i gui-deb-i