[yast-commit] r60618 - in /branches/tmp/bubli/libyui: cmake/FindLibyui.cmake configure.in libyui.spec.in
Author: kmachalkova Date: Fri Jan 29 15:21:06 2010 New Revision: 60618 URL: http://svn.opensuse.org/viewcvs/yast?rev=60618&view=rev Log: new includedir, new plugindir Modified: branches/tmp/bubli/libyui/cmake/FindLibyui.cmake branches/tmp/bubli/libyui/configure.in branches/tmp/bubli/libyui/libyui.spec.in Modified: branches/tmp/bubli/libyui/cmake/FindLibyui.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/cmake/FindLib... ============================================================================== --- branches/tmp/bubli/libyui/cmake/FindLibyui.cmake (original) +++ branches/tmp/bubli/libyui/cmake/FindLibyui.cmake Fri Jan 29 15:21:06 2010 @@ -24,12 +24,12 @@ ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) -SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/YaST2/plugin) +SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/yui) FIND_PATH(LIBYUI_INCLUDE_DIR YWidget.h - ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui - /usr/include/YaST2/yui - /usr/local/include/YaST2/yui + ${CMAKE_INSTALL_PREFIX}/include/yui + /usr/include/yui + /usr/local/include/yui ) FIND_LIBRARY(LIBYUI_LIBRARY NAMES yui Modified: branches/tmp/bubli/libyui/configure.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/configure.in?... ============================================================================== --- branches/tmp/bubli/libyui/configure.in (original) +++ branches/tmp/bubli/libyui/configure.in Fri Jan 29 15:21:06 2010 @@ -19,9 +19,9 @@ CXXFLAGS="${CXXFLAGS} -std=gnu++0x -DHAVE_CXX0X -Wall -Wformat=2 -Wnon-virtual-dtor" docdir=${prefix}/share/doc/packages/libyui -includedir=${prefix}/include/YaST2 +includedir=${prefix}/include/ pkgconfigdir=${libdir}/pkgconfig -plugindir=${libdir}/YaST2/plugin +plugindir=${libdir}/yui/ themedir=${prefix}/share/YaST2/theme/ AC_SUBST(VERSION) Modified: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.i... ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (original) +++ branches/tmp/bubli/libyui/libyui.spec.in Fri Jan 29 15:21:06 2010 @@ -92,7 +92,7 @@ %defattr(-,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la -%{_prefix}/include/YaST2 +%{_prefix}/include/yui %{_libdir}/pkgconfig/libyui.pc %dir %{_datadir}/cmake %dir %{_datadir}/cmake/Modules -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
kmachalkova@svn.opensuse.org