Author: dmacvicar Date: Thu Mar 13 13:56:58 2008 New Revision: 9126 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9126&view=rev Log: fix installing docs Modified: trunk/libzypp/doc/CMakeLists.txt trunk/libzypp/doc/autodoc/CMakeLists.txt trunk/libzypp/libzypp.spec.cmake Modified: trunk/libzypp/doc/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/doc/CMakeLists.txt?rev=9126&r1=9125&r2=9126&view=diff ============================================================================== --- trunk/libzypp/doc/CMakeLists.txt (original) +++ trunk/libzypp/doc/CMakeLists.txt Thu Mar 13 13:56:58 2008 @@ -1,22 +1,2 @@ -### ################################################## - ADD_SUBDIRECTORY( autodoc ) -########### install files ############### - - - - -#original Makefile.am contents follow: - -### Process this file with automake to produce Makefile.in -### ################################################## -# -#SUBDIRS = autodoc -# -### ################################################## -# -#htmldir = @pkgdocdir@ -#html_DATA = -# -### ################################################## Modified: trunk/libzypp/doc/autodoc/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/doc/autodoc/CMakeLists.txt?rev=9126&r1=9125&r2=9126&view=diff ============================================================================== --- trunk/libzypp/doc/autodoc/CMakeLists.txt (original) +++ trunk/libzypp/doc/autodoc/CMakeLists.txt Thu Mar 13 13:56:58 2008 @@ -49,15 +49,15 @@ ### ################################################## INSTALL( FILES - ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE}.doxytag - DESTINATION ${DOC_INSTALL_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/libzypp.doxytag + DESTINATION ${DOC_INSTALL_DIR}/libzypp/libzypp.doxytag ) # We could use the thing below but it wont work with cmake older than 2.4.4 FILE(GLOB docfiles ${CMAKE_CURRENT_BINARY_DIR}/html/*) INSTALL( FILES ${docfiles} - DESTINATION ${DOC_INSTALL_DIR}/html + DESTINATION ${DOC_INSTALL_DIR}/libzypp/html ) #INSTALL( DIRECTORY Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=9126&r1=9125&r2=9126&view=diff ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Thu Mar 13 13:56:58 2008 @@ -111,6 +111,7 @@ #make check %install +rm -rf "$RPM_BUILD_ROOT" cd build make install DESTDIR=$RPM_BUILD_ROOT make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org