Author: jkupec Date: Tue Jan 15 10:59:30 2008 New Revision: 8285 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8285&view=rev Log: - minor corrections Modified: trunk/zypper/CMakeLists.txt trunk/zypper/src/CMakeLists.txt Modified: trunk/zypper/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/CMakeLists.txt?rev=8285&r1=8284&r2=8285&view=diff ============================================================================== --- trunk/zypper/CMakeLists.txt (original) +++ trunk/zypper/CMakeLists.txt Tue Jan 15 10:59:30 2008 @@ -20,21 +20,16 @@ # system configuration dir (etc) IF( NOT DEFINED SYSCONFDIR ) - IF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" ) - # if installing in usr, set sysconfg to etc SET( SYSCONFDIR /etc ) - ELSE ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" ) - SET ( SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" ) - ENDIF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" ) ENDIF( NOT DEFINED SYSCONFDIR ) -MESSAGE(STATUS "Config files will be installed in ${SYSCONFDIR}" ) +MESSAGE( "** Config files will be installed in ${SYSCONFDIR}" ) # system configuration dir (etc) IF( NOT DEFINED MANDIR ) - SET( MANDIR ${CMAKE_INSTALL_PREFIX}/share/man ) + SET( MANDIR ${INSTALL_PREFIX}/share/man ) ENDIF( NOT DEFINED MANDIR ) - +MESSAGE( "** Manual files will be installed in ${MANDIR}" ) # PACKAGE Modified: trunk/zypper/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/CMakeLists.txt?rev=8285&r1=8284&r2=8285&view=diff ============================================================================== --- trunk/zypper/src/CMakeLists.txt (original) +++ trunk/zypper/src/CMakeLists.txt Tue Jan 15 10:59:30 2008 @@ -1,8 +1,10 @@ ADD_DEFINITIONS ( -DPACKAGE=\\\"${PACKAGE}\\\" - -DLOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/locale\\\" + -DLOCALEDIR=\\\"${INSTALL_PREFIX}/share/locale\\\" ) +MESSAGE ( "** Locale dir is ${INSTALL_PREFIX}/share/locale" ) + SET (zypper_HEADERS zypper.h zypper-main.h @@ -46,6 +48,8 @@ RUNTIME DESTINATION ${INSTALL_PREFIX}/bin ) +MESSAGE ( "** ZYpper binary will be installed in ${INSTALL_PREFIX}/bin" ) + ADD_EXECUTABLE( zypp-checkpatches zypp-checkpatches.cc zypper-updates.cc ) TARGET_LINK_LIBRARIES( zypp-checkpatches ${ZYPP_LIBRARY} ) @@ -63,7 +67,7 @@ ) -# logrotate config file +# installation_sources script INSTALL( PROGRAMS installation_sources DESTINATION ${INSTALL_PREFIX}/bin -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org