Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

[mdictionary] / trunk / src / base / base.pro

diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro
index 8d9d258..590366f 100644 (file)
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@ -1,28 +1,17 @@
-#-------------------------------------------------
-#
+# -------------------------------------------------
 # Project created by QtCreator 2010-08-03T08:54:27
-#
-#-------------------------------------------------
-
-QT       += core gui sql
-
-maemo5 {
-    QT += maemo5
-}
-
+# -------------------------------------------------
+QT += core \
+    gui \
+    sql
+maemo5:QT += maemo5
 TARGET = mdictionary
 TEMPLATE = app
-
 MDICT_BINDIR = $$[MDICT_BINDIR]
-
-isEmpty(MDICT_BINDIR) {
-  MDICT_BINDIR = .
-}
-
+isEmpty(MDICT_BINDIR):MDICT_BINDIR = .
 DESTDIR = $${MDICT_BINDIR}
-
-SOURCES += gui/main.cpp\
-        gui/MainWindow.cpp \
+SOURCES += gui/main.cpp \
+    gui/MainWindow.cpp \
     gui/SearchBarWidget.cpp \
     gui/WordListWidget.cpp \
     gui/TranslationWidget.cpp \
@@ -37,9 +26,11 @@ SOURCES += gui/main.cpp\
     backbone/Bookmarks.cpp \
     gui/SettingsWidget.cpp \
     gui/BookmarksWidget.cpp \
-    gui/WelcomeScreenWidget.cpp
+    gui/WelcomeScreenWidget.cpp \ 
+    gui/AboutWidget.cpp
 
 HEADERS  += gui/MainWindow.h \
+    gui/AboutWidget.h \
     gui/SearchBarWidget.h \
     gui/WordListWidget.h \
     gui/TranslationWidget.h \
@@ -63,6 +54,7 @@ HEADERS  += gui/MainWindow.h \
     gui/WelcomeScreenWidget.h
 
 FORMS    += gui/MainWindow.ui
+RESOURCES += gui/gui.qrc
 
 unix {
   #VARIABLES
@@ -94,7 +86,30 @@ maemo5 {
 }
   desktop.files += ../../../data/other/$${TARGET}.desktop
   icon64.files += ../../../data/icons/64x64/$${TARGET}.png
+unix { 
+    # VARIABLES
+    isEmpty(PREFIX):PREFIX = /usr
+    BINDIR = $$PREFIX/bin
+    DATADIR = $$PREFIX/share
+    DEFINES += DATADIR=\\\"$$DATADIR\\\" \
+        PKGDATADIR=\\\"$$PKGDATADIR\\\"
+    
+    # MAKE INSTALL
+    INSTALLS += target \
+        desktop \
+        icon64 \
+        configs
+    configs.path = ~/.mdictionary
+    configs.files += ../../../data/mdictionary.defaults
+    target.path = $$BINDIR
+    maemo5 { 
+        desktop.path = $$DATADIR/applications/hildon
+        icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
+    }
+    !maemo5 { 
+        desktop.path = $$DATADIR/applications
+        icon64.path = $$DATADIR/icons
+    }
+    desktop.files += ../../../data/other/$${TARGET}.desktop
+    icon64.files += ../../../data/icons/64x64/$${TARGET}.png
 }
-
-RESOURCES += \
-    gui/gui.qrc