From 8c5f44aaf220487e2e5c977a734559e806bdaf90 Mon Sep 17 00:00:00 2001 From: Thomas Goettlicher Date: Fri, 2 Aug 2013 06:07:45 -0700 Subject: [PATCH] bnc#831758: fix symbol icons --- PROJECTINFO.cmake | 8 ++++++-- libyui-qt-pkg.spec.in | 1 + src/CMakeLists.txt | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/PROJECTINFO.cmake b/PROJECTINFO.cmake index be0d591..4c4e2d5 100644 --- a/PROJECTINFO.cmake +++ b/PROJECTINFO.cmake @@ -19,8 +19,12 @@ SET( DESCRIPTION "This package contains the Qt package selector\ncomponen ## Things to cleanup; probably too yast2 related +IF( NOT PREFIX ) + SET( PREFIX "/usr" ) +ENDIF( NOT PREFIX ) + # used in src/icons and YQPackageSelectorHelp.cc (via -DHELPIMAGEDIR) probably specific to this file -SET( INSTALL_HELP_ICONS_DIR "${CMAKE_INSTALL_PREFIX}/share/YaST2/images" ) +SET( INSTALL_HELP_ICONS_DIR "${PREFIX}/share/YaST2/images" ) # maybe '#include ' rather than using '-DTHEMEDIR' -SET( YUIQT_THEMEDIR "${CMAKE_INSTALL_PREFIX}/share/YaST2/theme" ) +SET( YUIQT_THEMEDIR "${PREFIX}/share/YaST2/theme" ) diff --git a/libyui-qt-pkg.spec.in b/libyui-qt-pkg.spec.in index 0f77cc2..5819302 100644 --- a/libyui-qt-pkg.spec.in +++ b/libyui-qt-pkg.spec.in @@ -130,6 +130,7 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/@BASELIB@/lib*.so.* %doc %dir %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@ %doc %{_docdir}/@PROJECTNAME@@SONAME_MAJOR@/COPYING* +%{_prefix}/share/YaST2/images %files devel %defattr(-,root,root) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 926b807..e255fc8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1 +1,2 @@ PROCESS_SOURCES() +SUBDIRS(icons)