Merge pull request #74 from lpotter/master

[sensorfw] Fixes MER#1159 move setup file out of rpm dir
sailfishos · Jul 8, 2015 · d70ae48 · d70ae48
2 parents 37bba81 + baa8b1f
commit d70ae48
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/rpm/sensord-daemon-conf-setup → config/sensord-daemon-conf-setup b/rpm/sensord-daemon-conf-setup → config/sensord-daemon-conf-setup
diff --git a/sensorfw.pro b/sensorfw.pro
@@ -69,7 +69,7 @@ equals(QT_MAJOR_VERSION, 5):  {
         SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
         INSTALLS += SENSORDCONFIGFILES
 
-        SENSORDCONFIGHELPER.files = rpm/sensord-daemon-conf-setup
+        SENSORDCONFIGHELPER.files = config/sensord-daemon-conf-setup
         SENSORDCONFIGHELPER.path = /usr/bin
         INSTALLS += SENSORDCONFIGHELPER