cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mandir path when using GNUInstallDirs.cmake: on OpenBSD it's

Browse Source 
$prefix/man, not $prefix/share/man. While here, fix infodir too.

Pointed out by sthen@
Ok landry@, sthen@
This commit is contained in:
dcoppa 2012-06-27 19:28:39 +00:00
parent 50e576bd2e
commit d595a0834d
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/cmake/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.57 2012/06/15 10:26:56 dcoppa Exp $
# $OpenBSD: Makefile,v 1.58 2012/06/27 19:28:39 dcoppa Exp $
VMEM_WARNING = Yes
BROKEN-arm = build fails since move to gcc4
@ -7,7 +7,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.8
REVISION = 4
REVISION = 5
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dcoppa@openbsd.org>

41
devel/cmake/patches/patch-Modules_GNUInstallDirs_cmake Normal file
View File

@ -0,0 +1,41 @@
$OpenBSD: patch-Modules_GNUInstallDirs_cmake,v 1.1 2012/06/27 19:28:39 dcoppa Exp $
Fix INFODIR/MANDIR default path on OpenBSD
--- Modules/GNUInstallDirs.cmake.orig Wed Apr 18 20:10:54 2012
+++ Modules/GNUInstallDirs.cmake Tue Jun 26 19:58:52 2012
@@ -107,6 +107,14 @@ if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
endif()
+if(NOT DEFINED CMAKE_INSTALL_INFODIR)
+ set(CMAKE_INSTALL_INFODIR "info" CACHE PATH "info documentation (info)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_MANDIR)
+ set(CMAKE_INSTALL_MANDIR "man" CACHE PATH "man documentation (man)")
+endif()
+
if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
endif()
@@ -121,19 +129,9 @@ if(NOT CMAKE_INSTALL_DATADIR)
set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
endif()
-if(NOT CMAKE_INSTALL_INFODIR)
- set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
- set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
-endif()
-
if(NOT CMAKE_INSTALL_LOCALEDIR)
set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
-endif()
-
-if(NOT CMAKE_INSTALL_MANDIR)
- set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
- set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
endif()
if(NOT CMAKE_INSTALL_DOCDIR)