[gentoo-commits] gentoo-x86 commit in media-libs/lensfun/files: lensfun-0.2.8-build.patch

[gentoo-commits] gentoo-x86 commit in media-libs/lensfun/files: lensfun-0.2.8-build.patch

[Markus Meier (maekke)]

maekke      13/12/18 22:25:47

  Added:                lensfun-0.2.8-build.patch
  Log:
  version bump
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 072AD062)

Revision  Changes    Path
1.1                  media-libs/lensfun/files/lensfun-0.2.8-build.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lensfun/files/lensfun-0.2.8-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lensfun/files/lensfun-0.2.8-build.patch?rev=1.1&content-type=text/plain

Index: lensfun-0.2.8-build.patch
===================================================================
diff -ru lensfun-0.2.8.orig/CMakeLists.txt lensfun-0.2.8/CMakeLists.txt
--- lensfun-0.2.8.orig/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
+++ lensfun-0.2.8/CMakeLists.txt	2013-12-18 23:18:12.289679316 +0100
@@ -74,14 +74,9 @@
  
 # define destination dirs (relative to prefix)
 SET(BINDIR bin CACHE PATH "Directory for library example programs")
-SET(LIBDIR lib${LIB_SUFFIX} CACHE PATH "Directory for library itself")
 SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
 SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
 
-IF(BUILD_DOC)
-  SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX} CACHE PATH "Directory to put library documentation in")
-ENDIF(BUILD_DOC)
-
 IF(WIN32)
   # install into place in build-dir  
   SET(LENSFUN_INSTALL_PREFIX "${SOURCE_BASE_DIR}/lensfun" CACHE PATH "Install prefix for lensfun")    
@@ -134,12 +129,12 @@
 ENDIF()
 
 # install include files
-INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR}/lensfun)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR})
 IF(NOT HAVE_REGEX_H)
   INSTALL(FILES include/regex/regex.h DESTINATION ${INCLUDEDIR}/regex)
 ENDIF()
 IF(BUILD_AUXFUN)
-  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR}/auxfun)
+  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR})
 ENDIF()
 
 # install db files
diff -ru lensfun-0.2.8.orig/docs/CMakeLists.txt lensfun-0.2.8/docs/CMakeLists.txt
--- lensfun-0.2.8.orig/docs/CMakeLists.txt	2013-12-18 23:15:40.496926617 +0100
+++ lensfun-0.2.8/docs/CMakeLists.txt	2013-12-18 23:19:27.578052651 +0100
@@ -20,4 +20,4 @@
 )
 
 # install documentation  
-INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
+INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})