diff --git a/appindicator/appindicator.pro b/appindicator/appindicator.pro index bb36e90..d9de904 100644 --- a/appindicator/appindicator.pro +++ b/appindicator/appindicator.pro @@ -29,8 +29,8 @@ QMAKE_CXXFLAGS += -Wno-write-strings -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MA DATADIR = $$PREFIX/share actions64.path = $$DATADIR/icons/hicolor/64x64/actions -actions64.files += resources/images/qcma_on.png -actions64.files += resources/images/qcma_off.png +actions64.files += ../gui/resources/images/qcma_on.png +actions64.files += ../gui/resources/images/qcma_off.png target.path = /usr/lib/qcma INSTALLS += target actions64 diff --git a/debian/qcma-appindicator.install b/debian/qcma-appindicator.install index 031c357..33c4ed7 100644 --- a/debian/qcma-appindicator.install +++ b/debian/qcma-appindicator.install @@ -1,3 +1,3 @@ usr/lib/qcma/libqcma_appindicator.so -resources/images/qcma_on.png usr/share/icons/hicolor/64x64/actions -resources/images/qcma_off.png usr/share/icons/hicolor/64x64/actions +gui/resources/images/qcma_on.png usr/share/icons/hicolor/64x64/actions +gui/resources/images/qcma_off.png usr/share/icons/hicolor/64x64/actions diff --git a/debian/rules b/debian/rules index 6dc432c..bc2bf30 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export QT_SELECT=qt5 dh $@ --buildsystem=qmake override_dh_auto_configure: - lrelease resources/translations/qcma_*.ts + lrelease common/resources/translations/qcma_*.ts dh_auto_configure -- qcma.pro CONFIG+="ENABLE_APPINDICATOR" .PHONY: override_dh_auto_configure diff --git a/rpmbuild/qcma.spec b/rpmbuild/qcma.spec index 93bf604..f20b2c4 100644 --- a/rpmbuild/qcma.spec +++ b/rpmbuild/qcma.spec @@ -62,7 +62,7 @@ is meant to be compatible with Linux, Windows and MAC OS X. %setup -n %{name}-%{version} %build -lrelease-qt5 resources/translations/*.ts +lrelease-qt5 common/resources/translations/*.ts qmake-qt5 PREFIX=/usr qcma.pro CONFIG+="QT5_SUFFIX ENABLE_KNOTIFICATIONS ENABLE_APPINDICATOR ENABLE_KDENOTIFIER" make %{?_smp_mflags}