51 lines
2.6 KiB
Diff
51 lines
2.6 KiB
Diff
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
|
Date: 2009-03-21
|
|
Initial Package Version: 0.9
|
|
Origin: me
|
|
Upstream Status: unknown
|
|
Description: find lightscribe in opt and install dbus files in right dir
|
|
|
|
diff -Naur qlscribe-0.9.orig/cmake/FindLightScribe.cmake qlscribe-0.9/cmake/FindLightScribe.cmake
|
|
--- qlscribe-0.9.orig/cmake/FindLightScribe.cmake 2009-03-11 00:51:03.000000000 +0000
|
|
+++ qlscribe-0.9/cmake/FindLightScribe.cmake 2009-03-21 08:44:39.000000000 +0000
|
|
@@ -18,9 +18,9 @@
|
|
#
|
|
# $Id: FindLightScribe.cmake 72 2009-02-22 01:27:45Z ruglory $
|
|
|
|
-FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include $ENV{LIGHTSCRIBEDIR}/include )
|
|
+FIND_PATH( LSCRIBE_INCLUDE_DIR lightscribe.h /usr/local/include /usr/include/lightsribe $ENV{LIGHTSCRIBEDIR}/include )
|
|
|
|
-FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib $ENV{LIGHTSCRIBEDIR}/lib )
|
|
+FIND_LIBRARY( LSCRIBE_LIBRARY lightscribe /usr/local/lib /opt/lightscribe/lib /opt/lightscribe/lib32 $ENV{LIGHTSCRIBEDIR}/lib )
|
|
|
|
if( LSCRIBE_INCLUDE_DIR AND LSCRIBE_LIBRARY )
|
|
SET( LSCRIBE_FOUND TRUE )
|
|
diff -Naur qlscribe-0.9.orig/lscribed/CMakeLists.txt qlscribe-0.9/lscribed/CMakeLists.txt
|
|
--- qlscribe-0.9.orig/lscribed/CMakeLists.txt 2009-03-11 00:51:04.000000000 +0000
|
|
+++ qlscribe-0.9/lscribed/CMakeLists.txt 2009-03-21 14:44:03.289663341 +0000
|
|
@@ -34,6 +34,18 @@
|
|
SET( CMAKE_EXE_LINKER_FLAGS "-m32 -pthread ${CMAKE_EXE_LINKER_FLAGS}" )
|
|
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
|
|
|
|
+IF (DBUS_SYSTEM_POLICY_DIR)
|
|
+ INSTALL( FILES ${LSCRIBED_CONF_FILE} DESTINATION ${DBUS_SYSTEM_POLICY_DIR})
|
|
+ELSE (DBUS_SYSTEM_POLICY_DIR)
|
|
+ MESSAGE(STATUS "It is necessary to specify the directory where the client policy file for Qt Lightscribe is installed as DBUS_SYSTEM_POLICY_DIR. Normally this is /etc/dbus-1/system.d on a Linux system")
|
|
+endif (DBUS_SYSTEM_POLICY_DIR)
|
|
+
|
|
+IF (DBUS_SYSTEM_SERVICE_DIR)
|
|
+ INSTALL( FILES ${LSCRIBED_SERVICE_FILE} DESTINATION ${DBUS_SYSTEM_SERVICE_DIR})
|
|
+ELSE (DBUS_SYSTEM_SERVICE_DIR)
|
|
+ MESSAGE(STATUS "It is necessary to specify the directory where the client service file for Qt Lightscribe is installed as DBUS_SYSTEM_SERVICE_DIR. Normally this is /usr/share/dbus-1/services on a Linux system")
|
|
+endif (DBUS_SYSTEM_SERVICE_DIR)
|
|
+
|
|
SET( LSCRIBED_SRCS main.cpp dbuscpp.cpp drives.cpp managerhandler.cpp drivehandler.cpp
|
|
introspecthandler.cpp )
|
|
|
|
@@ -46,5 +58,4 @@
|
|
TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} pthread )
|
|
|
|
INSTALL( TARGETS lscribed DESTINATION sbin )
|
|
-INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )
|
|
|