Merge pull request #6 from xiannox/testing

Merge pull request #5 from xiannox/testing
2013-12-17 17:06:00 -08:00
parent 9c67329549 a4eba80804
commit 8e33c89412
3 changed files with 4 additions and 4 deletions
--- a/qcma.pro
+++ b/qcma.pro
@@ -101,10 +101,10 @@ unix {
     DATADIR = $$PREFIX/share

    desktop.path = $$DATADIR/applications/$${TARGET}
-    desktop.files += $${TARGET}.desktop
+    desktop.files += resources/$${TARGET}.desktop

    icon64.path = $$DATADIR/icons/hicolor/64x64/apps
-    icon64.files += resources/$${TARGET}.png
+    icon64.files += resources/images/$${TARGET}.png

    target.path = $$BINDIR
    INSTALLS += target desktop icon64
--- a/rpmbuild/qcma.spec
+++ b/rpmbuild/qcma.spec
@@ -28,7 +28,7 @@ cp -r $RPM_SOURCE_DIR/qcma $RPM_BUILD_DIR/qcma
 %setup -n qcma -DT

 %build
-lrelease qcma.pro
+lrelease resources/translations/*.ts
 qmake PREFIX=/usr
 make

--- a/rpmbuild/qcma64.spec
+++ b/rpmbuild/qcma64.spec
@@ -28,7 +28,7 @@ cp -r $RPM_SOURCE_DIR/qcma $RPM_BUILD_DIR/qcma
 %setup -n qcma -DT

 %build
-lrelease qcma.pro
+lrelease resources/translations/*.ts
 qmake PREFIX=/usr
 make