Author: tgoettlicher Date: Tue May 15 15:12:48 2012 New Revision: 68156 URL: http://svn.opensuse.org/viewcvs/yast?rev=68156&view=rev Log: Reverted changes Added: trunk/libyui/package/yast2-libyui-rpmlintrc - copied unchanged from r68062, trunk/libyui/package/yast2-libyui-rpmlintrc trunk/libyui/package/yast2-libyui.changes - copied unchanged from r68062, trunk/libyui/package/yast2-libyui.changes trunk/libyui/yast2-libyui.spec.in - copied unchanged from r68062, trunk/libyui/yast2-libyui.spec.in Removed: trunk/libyui/Makefile.am trunk/libyui/Makefile.in trunk/libyui/configure.in trunk/libyui/libyui.pc.in trunk/libyui/libyui.spec.in trunk/libyui/package/libyui-rpmlintrc trunk/libyui/package/libyui.changes Modified: trunk/libyui/Makefile.cvs trunk/libyui/RPMNAME trunk/libyui/VERSION trunk/libyui/cmake/FindLibyui.cmake Modified: trunk/libyui/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/Makefile.cvs?rev=68156&r1=68155&r2=68156&view=diff ============================================================================== --- trunk/libyui/Makefile.cvs (original) +++ trunk/libyui/Makefile.cvs Tue May 15 15:12:48 2012 @@ -2,16 +2,17 @@ # Makefile.cvs # +LIB = $(shell y2tool get-lib) + PREFIX = /usr configure: all - ./configure --prefix=$(PREFIX) + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) all: - aclocal - autoconf - autoheader - autoreconf --force --install + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install -v install: configure make Modified: trunk/libyui/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/RPMNAME?rev=68156&r1=68155&r2=68156&view=diff ============================================================================== --- trunk/libyui/RPMNAME (original) +++ trunk/libyui/RPMNAME Tue May 15 15:12:48 2012 @@ -1 +1 @@ -libyui +yast2-libyui Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=68156&r1=68155&r2=68156&view=diff ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Tue May 15 15:12:48 2012 @@ -1 +1 @@ -2.21.5 +2.21.4 Modified: trunk/libyui/cmake/FindLibyui.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/cmake/FindLibyui.cmake?rev=68156&r1=68155&r2=68156&view=diff ============================================================================== --- trunk/libyui/cmake/FindLibyui.cmake (original) +++ trunk/libyui/cmake/FindLibyui.cmake Tue May 15 15:12:48 2012 @@ -20,22 +20,22 @@ IF (CMAKE_SIZEOF_VOID_P MATCHES "8") SET( LIB_SUFFIX "64" ) ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") - SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" ) + SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) ENDIF ( DEFINED LIB ) MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" ) -SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/yui) +SET(UI_PLUGIN_DIR ${LIB_INSTALL_DIR}/YaST2/plugin) FIND_PATH(LIBYUI_INCLUDE_DIR YWidget.h - ${CMAKE_INSTALL_PREFIX}/include/yui - /usr/include/yui - /usr/local/include/yui + ${CMAKE_INSTALL_PREFIX}/include/YaST2/yui + /usr/include/YaST2/yui + /usr/local/include/YaST2/yui ) FIND_LIBRARY(LIBYUI_LIBRARY NAMES yui PATHS ${LIB_INSTALL_DIR} - /usr/lib + /usr/local/lib ) if(LIBYUI_INCLUDE_DIR AND LIBYUI_LIBRARY AND UI_PLUGIN_DIR) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org