unity-2d

Merge lp:~osomon/unity-2d/libdir into lp:unity-2d

  1. libdir
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 780
Merged at revision: 777
Proposed branch: lp:~osomon/unity-2d/libdir
Merge into: lp:unity-2d
Diff against target: 491 lines (+91/-75)
31 files modified
.bzrignore (+4/-0)
CMakeLists.txt (+14/-1)
config.h.in (+5/-3)
debian/libunity-2d-private-dev.install.in (+3/-3)
debian/libunity-2d-private0.install.in (+3/-3)
debian/rules (+0/-1)
debian/unity-2d-launcher.install.in (+5/-5)
debian/unity-2d-panel.install.in (+3/-3)
debian/unity-2d-places.install.in (+6/-6)
debian/unity-2d-spread.install.in (+4/-4)
debian/unity-2d.install.in (+7/-7)
debian/unity-2d.postinst.in (+6/-6)
debian/unity-2d.postrm.in (+3/-3)
debian/unity-2d.triggers.in (+2/-2)
launcher/app/CMakeLists.txt (+3/-3)
launcher/app/unity-2d-launcher.service.in (+1/-1)
libunity-2d-private/Unity2d/CMakeLists.txt (+1/-1)
libunity-2d-private/src/CMakeLists.txt (+3/-5)
libunity-2d-private/src/unity-2d-private.pc.cmake (+2/-2)
panel/app/CMakeLists.txt (+2/-2)
panel/applets/appindicator/CMakeLists.txt (+1/-1)
panel/applets/appname/CMakeLists.txt (+1/-1)
panel/applets/homebutton/CMakeLists.txt (+1/-1)
panel/applets/indicator/CMakeLists.txt (+1/-1)
panel/applets/legacytray/CMakeLists.txt (+1/-1)
panel/applets/separator/CMakeLists.txt (+1/-1)
places/app/CMakeLists.txt (+3/-3)
places/app/unity-2d-places.service.in (+1/-1)
po/CMakeLists.txt (+1/-1)
spread/app/CMakeLists.txt (+2/-2)
spread/app/unity-2d-spread.service.in (+1/-1)
To merge this branch: bzr merge lp:~osomon/unity-2d/libdir
Reviewer Review Type Date Requested Status
unity-2d-team Pending
Review via email: mp+81861@code.launchpad.net

Commit message

Un-hardcode standard install paths (use GNUInstallDirs.cmake).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2011-11-09 14:40:53 +0000
3+++ .bzrignore 2011-11-10 14:44:33 +0000
4@@ -60,6 +60,10 @@
5
6 # Debian packaging files
7 obj-x86_64-linux-gnu
8+debian/*.install
9+debian/unity-2d.postinst
10+debian/unity-2d.postrm
11+debian/unity-2d.triggers
12 debian/files
13 debian/*.debhelper.log
14 debian/*.substvars
15
16=== modified file 'CMakeLists.txt'
17--- CMakeLists.txt 2011-07-28 09:45:37 +0000
18+++ CMakeLists.txt 2011-11-10 14:44:33 +0000
19@@ -1,13 +1,26 @@
20 project(unity-2d)
21 cmake_minimum_required(VERSION 2.8)
22
23+# Standard install paths
24+include(GNUInstallDirs)
25+
26 # Dirs
27-set(UNITY_2D_DIR share/unity-2d)
28+set(UNITY_2D_DIR "${CMAKE_INSTALL_DATADIR}/unity-2d")
29 set(UNITY_DIR /usr/share/unity/)
30 set(UNITY_2D_DATA_DIR "${CMAKE_SOURCE_DIR}/data")
31
32 configure_file(config.h.in config.h)
33
34+# Configure debian files
35+string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" 1 -1 DEBIAN_INSTALL_PREFIX)
36+file(GLOB DEBIAN_FILES debian/*.in)
37+foreach(in_file ${DEBIAN_FILES})
38+ string(LENGTH ${in_file} len)
39+ math(EXPR len "${len} - 3")
40+ string(SUBSTRING "${in_file}" 0 ${len} file)
41+ configure_file(${in_file} ${file} @ONLY)
42+endforeach(in_file)
43+
44 # Build flags
45 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -std=c++0x")
46 # Flags to help detecting use of deprecated GTK APIs and direct access to object fields
47
48=== modified file 'config.h.in'
49--- config.h.in 2011-08-11 16:05:32 +0000
50+++ config.h.in 2011-11-10 14:44:33 +0000
51@@ -1,11 +1,13 @@
52 #define INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
53+#define INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}"
54+#define INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}"
55 #define UNITY_2D_DIR "${UNITY_2D_DIR}"
56 #define UNITY_DIR "${UNITY_DIR}"
57
58 #include <QCoreApplication>
59
60 inline bool isRunningInstalled() {
61- static bool cachedResult = QCoreApplication::applicationDirPath() == INSTALL_PREFIX "/bin";
62+ static bool cachedResult = QCoreApplication::applicationDirPath() == INSTALL_PREFIX "/" INSTALL_BINDIR;
63 return cachedResult;
64 }
65
66@@ -19,7 +21,7 @@
67
68 inline QString unity2dImportPath() {
69 if (isRunningInstalled()) {
70- return QString(INSTALL_PREFIX "/lib/qt4/imports");
71+ return QString(INSTALL_PREFIX "/" INSTALL_LIBDIR "/qt4/imports");
72 } else {
73 return QString(QCoreApplication::applicationDirPath()+"/../");
74 }
75@@ -27,7 +29,7 @@
76
77 inline QString unity2dPluginsPath() {
78 if (isRunningInstalled()) {
79- return QString(INSTALL_PREFIX "/lib/unity-2d/plugins");
80+ return QString(INSTALL_PREFIX "/" INSTALL_LIBDIR "/unity-2d/plugins");
81 } else {
82 return unity2dDirectory();
83 }
84
85=== renamed file 'debian/libunity-2d-private-dev.install' => 'debian/libunity-2d-private-dev.install.in'
86--- debian/libunity-2d-private-dev.install 2011-07-29 14:08:23 +0000
87+++ debian/libunity-2d-private-dev.install.in 2011-11-10 14:44:33 +0000
88@@ -1,3 +1,3 @@
89-usr/lib/libunity-2d-private.so
90-usr/include/unity-2d-private
91-usr/lib/pkgconfig
92+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/libunity-2d-private.so
93+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/unity-2d-private
94+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/pkgconfig
95
96=== renamed file 'debian/libunity-2d-private0.install' => 'debian/libunity-2d-private0.install.in'
97--- debian/libunity-2d-private0.install 2011-06-08 13:48:11 +0000
98+++ debian/libunity-2d-private0.install.in 2011-11-10 14:44:33 +0000
99@@ -1,3 +1,3 @@
100-usr/lib/libunity-2d-private.so.*
101-usr/lib/qt4/imports/Unity2d
102-usr/share/unity-2d/warty-final-ubuntu.jpg
103+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/libunity-2d-private.so.*
104+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/qt4/imports/Unity2d
105+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/warty-final-ubuntu.jpg
106
107=== modified file 'debian/rules'
108--- debian/rules 2011-07-29 14:08:23 +0000
109+++ debian/rules 2011-11-10 14:44:33 +0000
110@@ -9,7 +9,6 @@
111 export NO_PNG_PKG_MANGLE=1
112
113 override_dh_install:
114- find debian/tmp/usr/lib -name \*.*a -exec rm {} \;
115 dh_install --fail-missing
116
117 override_dh_auto_test:
118
119=== renamed file 'debian/unity-2d-launcher.install' => 'debian/unity-2d-launcher.install.in'
120--- debian/unity-2d-launcher.install 2011-06-08 20:43:09 +0000
121+++ debian/unity-2d-launcher.install.in 2011-11-10 14:44:33 +0000
122@@ -1,5 +1,5 @@
123-usr/bin/unity-2d-launcher
124-usr/share/dbus-1/services/unity-2d-launcher.service
125-usr/share/applications/unity-2d-launcher.desktop
126-usr/share/unity-2d/launcher/*.qml
127-usr/share/unity-2d/launcher/artwork
128+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-launcher
129+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-launcher.service
130+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/applications/unity-2d-launcher.desktop
131+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/launcher/*.qml
132+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/launcher/artwork
133
134=== renamed file 'debian/unity-2d-panel.install' => 'debian/unity-2d-panel.install.in'
135--- debian/unity-2d-panel.install 2011-08-22 09:17:03 +0000
136+++ debian/unity-2d-panel.install.in 2011-11-10 14:44:33 +0000
137@@ -1,3 +1,3 @@
138-usr/bin/unity-2d-panel
139-usr/lib/unity-2d/plugins/panel/libpanelplugin-*.so*
140-usr/share/applications/unity-2d-panel.desktop
141+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-panel
142+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/unity-2d/plugins/panel/libpanelplugin-*.so*
143+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/applications/unity-2d-panel.desktop
144
145=== renamed file 'debian/unity-2d-places.install' => 'debian/unity-2d-places.install.in'
146--- debian/unity-2d-places.install 2011-08-25 14:20:10 +0000
147+++ debian/unity-2d-places.install.in 2011-11-10 14:44:33 +0000
148@@ -1,6 +1,6 @@
149-usr/bin/unity-2d-places
150-usr/share/applications/unity-2d-places.desktop
151-usr/share/dbus-1/services/unity-2d-places.service
152-usr/share/unity-2d/places/*.qml
153-usr/share/unity-2d/places/*.js
154-usr/share/unity-2d/places/artwork
155+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-places
156+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/applications/unity-2d-places.desktop
157+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-places.service
158+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/places/*.qml
159+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/places/*.js
160+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/places/artwork
161
162=== renamed file 'debian/unity-2d-spread.install' => 'debian/unity-2d-spread.install.in'
163--- debian/unity-2d-spread.install 2011-02-08 14:38:47 +0000
164+++ debian/unity-2d-spread.install.in 2011-11-10 14:44:33 +0000
165@@ -1,4 +1,4 @@
166-usr/bin/unity-2d-spread
167-usr/share/dbus-1/services/unity-2d-spread.service
168-usr/share/unity-2d/spread/*.qml
169-usr/share/unity-2d/spread/utils.js
170+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-spread
171+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-spread.service
172+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/spread/*.qml
173+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/spread/utils.js
174
175=== renamed file 'debian/unity-2d.install' => 'debian/unity-2d.install.in'
176--- debian/unity-2d.install 2011-07-26 16:16:52 +0000
177+++ debian/unity-2d.install.in 2011-11-10 14:44:33 +0000
178@@ -1,7 +1,7 @@
179-debian/unity-2d.py /usr/share/apport/package-hooks
180-debian/gconf/* /usr/share/gconf
181-debian/20_ubuntu-2d-gconf-mandatory /usr/share/gconf/ubuntu-2d/mandatory
182-debian/20_ubuntu-2d-gconf-default /usr/share/gconf/ubuntu-2d/default
183-usr/share/locale/*/LC_MESSAGES/unity-2d.mo
184-usr/share/glib-2.0/schemas/com.canonical.Unity2d.gschema.xml
185-usr/share/GConf/gsettings
186+debian/unity-2d.py @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/apport/package-hooks
187+debian/gconf/* @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf
188+debian/20_ubuntu-2d-gconf-mandatory @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/mandatory
189+debian/20_ubuntu-2d-gconf-default @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default
190+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/locale/*/LC_MESSAGES/unity-2d.mo
191+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/glib-2.0/schemas/com.canonical.Unity2d.gschema.xml
192+@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/GConf/gsettings
193
194=== renamed file 'debian/unity-2d.postinst' => 'debian/unity-2d.postinst.in'
195--- debian/unity-2d.postinst 2011-06-22 18:30:57 +0000
196+++ debian/unity-2d.postinst.in 2011-11-10 14:44:33 +0000
197@@ -17,12 +17,12 @@
198 triggered)
199 for trigger in $2; do
200 case $trigger in
201- /usr/share/gconf/ubuntu-2d/mandatory)
202- update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
203+ @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/mandatory)
204+ update-gconf-defaults --source @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/mandatory \
205 --destination /var/lib/gconf/ubuntu-2d.mandatory --no-signal
206 ;;
207- /usr/share/gconf/ubuntu-2d/default)
208- update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
209+ @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default)
210+ update-gconf-defaults --source @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default \
211 --destination /var/lib/gconf/ubuntu-2d.default --no-signal
212 ;;
213 esac
214@@ -36,9 +36,9 @@
215
216 # Upon installation/upgrade, regenerate all databases, because in this case
217 # there will be no trigger run
218-update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
219+update-gconf-defaults --source @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/mandatory \
220 --destination /var/lib/gconf/ubuntu-2d.mandatory --no-signal
221-update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
222+update-gconf-defaults --source @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default \
223 --destination /var/lib/gconf/ubuntu-2d.default --no-signal
224 signal_daemons
225
226
227=== renamed file 'debian/unity-2d.postrm' => 'debian/unity-2d.postrm.in'
228--- debian/unity-2d.postrm 2011-06-22 18:30:57 +0000
229+++ debian/unity-2d.postrm.in 2011-11-10 14:44:33 +0000
230@@ -3,10 +3,10 @@
231
232 case "$1" in
233 remove|purge)
234- if which update-gconf-defaults >/dev/null 2>&1 && [ -d /usr/share/gconf/mandatory/ubuntu-2d ]; then
235- update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/mandatory \
236+ if which update-gconf-defaults >/dev/null 2>&1 && [ -d @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/mandatory/ubuntu-2d ]; then
237+ update-gconf-defaults --source @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/mandatory \
238 --destination /var/lib/gconf/ubuntu-2d.mandatory
239- update-gconf-defaults --source /usr/share/gconf/ubuntu-2d/default \
240+ update-gconf-defaults --source @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/ubuntu-2d/default \
241 --destination /var/lib/gconf/ubuntu-2d.default
242 fi
243 if [ -d /var/lib/gconf/ubuntu-2d.mandatory ]; then
244
245=== renamed file 'debian/unity-2d.triggers' => 'debian/unity-2d.triggers.in'
246--- debian/unity-2d.triggers 2011-07-26 16:16:52 +0000
247+++ debian/unity-2d.triggers.in 2011-11-10 14:44:33 +0000
248@@ -1,2 +1,2 @@
249-interest /usr/share/gconf/unity-2d/default
250-interest /usr/share/gconf/unity-2d/mandatory
251+interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/unity-2d/default
252+interest @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/gconf/unity-2d/mandatory
253
254=== modified file 'launcher/app/CMakeLists.txt'
255--- launcher/app/CMakeLists.txt 2011-07-27 12:29:17 +0000
256+++ launcher/app/CMakeLists.txt 2011-11-10 14:44:33 +0000
257@@ -59,14 +59,14 @@
258
259 # Install
260 install(TARGETS unity-2d-launcher
261- RUNTIME DESTINATION bin
262+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
263 )
264
265 install(FILES unity-2d-launcher.desktop
266- DESTINATION share/applications
267+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
268 )
269
270 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-2d-launcher.service
271- DESTINATION share/dbus-1/services
272+ DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
273 )
274
275
276=== modified file 'launcher/app/unity-2d-launcher.service.in'
277--- launcher/app/unity-2d-launcher.service.in 2011-01-18 15:23:53 +0000
278+++ launcher/app/unity-2d-launcher.service.in 2011-11-10 14:44:33 +0000
279@@ -1,3 +1,3 @@
280 [D-BUS Service]
281 Name=com.canonical.Unity2d.Launcher
282-Exec=@CMAKE_INSTALL_PREFIX@/bin/unity-2d-launcher
283+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-launcher
284
285=== modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
286--- libunity-2d-private/Unity2d/CMakeLists.txt 2011-08-12 16:23:47 +0000
287+++ libunity-2d-private/Unity2d/CMakeLists.txt 2011-11-10 14:44:33 +0000
288@@ -43,7 +43,7 @@
289 )
290
291 # Install
292-set(IMPORT_INSTALL_DIR lib/qt4/imports/Unity2d)
293+set(IMPORT_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt4/imports/Unity2d)
294
295 install(TARGETS unity-2d-private-qml
296 LIBRARY DESTINATION ${IMPORT_INSTALL_DIR}
297
298=== modified file 'libunity-2d-private/src/CMakeLists.txt'
299--- libunity-2d-private/src/CMakeLists.txt 2011-11-08 20:19:17 +0000
300+++ libunity-2d-private/src/CMakeLists.txt 2011-11-10 14:44:33 +0000
301@@ -141,9 +141,7 @@
302
303 # Install
304 install(TARGETS ${LIB_NAME}
305- LIBRARY DESTINATION lib${LIB_SUFFIX}
306- ARCHIVE DESTINATION lib
307- RUNTIME DESTINATION bin
308+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
309 )
310
311 #
312@@ -153,12 +151,12 @@
313 set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
314
315 install(DIRECTORY .
316- DESTINATION include/${LIB_NAME}
317+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${LIB_NAME}
318 FILES_MATCHING PATTERN "*.h"
319 PATTERN "*_p.h" EXCLUDE
320 )
321
322 configure_file (${LIB_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc @ONLY)
323 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc DESTINATION
324- ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
325+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
326
327
328=== modified file 'libunity-2d-private/src/unity-2d-private.pc.cmake'
329--- libunity-2d-private/src/unity-2d-private.pc.cmake 2011-11-08 20:19:17 +0000
330+++ libunity-2d-private/src/unity-2d-private.pc.cmake 2011-11-10 14:44:33 +0000
331@@ -1,7 +1,7 @@
332 prefix=@PREFIXDIR@
333 exec_prefix=@EXEC_PREFIX@
334-libdir=${exec_prefix}/lib
335-includedir=${prefix}/include
336+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
337+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
338
339 Name: unity-2d-private
340 Description: Unity 2d private library
341
342=== modified file 'panel/app/CMakeLists.txt'
343--- panel/app/CMakeLists.txt 2011-09-27 13:58:46 +0000
344+++ panel/app/CMakeLists.txt 2011-11-10 14:44:33 +0000
345@@ -26,9 +26,9 @@
346 )
347
348 install(TARGETS unity-2d-panel
349- RUNTIME DESTINATION bin
350+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
351 )
352
353 install(FILES unity-2d-panel.desktop
354- DESTINATION share/applications
355+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
356 )
357
358=== modified file 'panel/applets/appindicator/CMakeLists.txt'
359--- panel/applets/appindicator/CMakeLists.txt 2011-08-12 15:17:23 +0000
360+++ panel/applets/appindicator/CMakeLists.txt 2011-11-10 14:44:33 +0000
361@@ -34,5 +34,5 @@
362 )
363
364 install(TARGETS panelplugin-appindicator
365- LIBRARY DESTINATION lib/unity-2d/plugins/panel
366+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity-2d/plugins/panel
367 )
368
369=== modified file 'panel/applets/appname/CMakeLists.txt'
370--- panel/applets/appname/CMakeLists.txt 2011-08-22 09:17:03 +0000
371+++ panel/applets/appname/CMakeLists.txt 2011-11-10 14:44:33 +0000
372@@ -47,5 +47,5 @@
373 )
374
375 install(TARGETS panelplugin-appname
376- LIBRARY DESTINATION lib/unity-2d/plugins/panel
377+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity-2d/plugins/panel
378 )
379
380=== modified file 'panel/applets/homebutton/CMakeLists.txt'
381--- panel/applets/homebutton/CMakeLists.txt 2011-08-12 15:17:23 +0000
382+++ panel/applets/homebutton/CMakeLists.txt 2011-11-10 14:44:33 +0000
383@@ -29,5 +29,5 @@
384 )
385
386 install(TARGETS panelplugin-homebutton
387- LIBRARY DESTINATION lib/unity-2d/plugins/panel
388+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity-2d/plugins/panel
389 )
390
391=== modified file 'panel/applets/indicator/CMakeLists.txt'
392--- panel/applets/indicator/CMakeLists.txt 2011-09-27 13:58:46 +0000
393+++ panel/applets/indicator/CMakeLists.txt 2011-11-10 14:44:33 +0000
394@@ -56,5 +56,5 @@
395 )
396
397 install(TARGETS panelplugin-indicator
398- LIBRARY DESTINATION lib/unity-2d/plugins/panel
399+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity-2d/plugins/panel
400 )
401
402=== modified file 'panel/applets/legacytray/CMakeLists.txt'
403--- panel/applets/legacytray/CMakeLists.txt 2011-09-01 09:03:12 +0000
404+++ panel/applets/legacytray/CMakeLists.txt 2011-11-10 14:44:33 +0000
405@@ -41,5 +41,5 @@
406 )
407
408 install(TARGETS panelplugin-legacytray
409- LIBRARY DESTINATION lib/unity-2d/plugins/panel
410+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity-2d/plugins/panel
411 )
412
413=== modified file 'panel/applets/separator/CMakeLists.txt'
414--- panel/applets/separator/CMakeLists.txt 2011-08-12 15:17:23 +0000
415+++ panel/applets/separator/CMakeLists.txt 2011-11-10 14:44:33 +0000
416@@ -28,5 +28,5 @@
417 )
418
419 install(TARGETS panelplugin-separator
420- LIBRARY DESTINATION lib/unity-2d/plugins/panel
421+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity-2d/plugins/panel
422 )
423
424=== modified file 'places/app/CMakeLists.txt'
425--- places/app/CMakeLists.txt 2011-07-18 14:36:34 +0000
426+++ places/app/CMakeLists.txt 2011-11-10 14:44:33 +0000
427@@ -44,13 +44,13 @@
428
429 # Install
430 install(TARGETS unity-2d-places
431- RUNTIME DESTINATION bin
432+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
433 )
434
435 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-2d-places.service
436- DESTINATION share/dbus-1/services
437+ DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
438 )
439
440 install(FILES unity-2d-places.desktop
441- DESTINATION share/applications
442+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
443 )
444
445=== modified file 'places/app/unity-2d-places.service.in'
446--- places/app/unity-2d-places.service.in 2011-03-04 17:25:16 +0000
447+++ places/app/unity-2d-places.service.in 2011-11-10 14:44:33 +0000
448@@ -1,3 +1,3 @@
449 [D-BUS Service]
450 Name=com.canonical.Unity2d.Dash
451-Exec=@CMAKE_INSTALL_PREFIX@/bin/unity-2d-places
452+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-places
453
454=== modified file 'po/CMakeLists.txt'
455--- po/CMakeLists.txt 2011-05-25 16:39:08 +0000
456+++ po/CMakeLists.txt 2011-11-10 14:44:33 +0000
457@@ -38,7 +38,7 @@
458 add_dependencies(msgmerge msgmerge-${_lang})
459
460 # Install .gmo
461- install(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
462+ install(FILES ${_gmoFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
463 endforeach(_currentPoFile)
464
465 # Create the msgfmt target, building all .gmo files
466
467=== modified file 'spread/app/CMakeLists.txt'
468--- spread/app/CMakeLists.txt 2011-07-18 14:36:34 +0000
469+++ spread/app/CMakeLists.txt 2011-11-10 14:44:33 +0000
470@@ -41,10 +41,10 @@
471
472 # Install
473 install(TARGETS unity-2d-spread
474- RUNTIME DESTINATION bin
475+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
476 )
477
478 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-2d-spread.service
479- DESTINATION share/dbus-1/services
480+ DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
481 )
482
483
484=== modified file 'spread/app/unity-2d-spread.service.in'
485--- spread/app/unity-2d-spread.service.in 2011-01-14 20:47:33 +0000
486+++ spread/app/unity-2d-spread.service.in 2011-11-10 14:44:33 +0000
487@@ -1,3 +1,3 @@
488 [D-BUS Service]
489 Name=com.canonical.Unity2d.Spread
490-Exec=@CMAKE_INSTALL_PREFIX@/bin/unity-2d-spread
491+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-spread

Subscribers

People subscribed via source and target branches