summaryrefslogtreecommitdiff
path: root/math/plplot/files/patch-cmake_modules_instdirs.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'math/plplot/files/patch-cmake_modules_instdirs.cmake')
-rw-r--r--math/plplot/files/patch-cmake_modules_instdirs.cmake18
1 files changed, 9 insertions, 9 deletions
diff --git a/math/plplot/files/patch-cmake_modules_instdirs.cmake b/math/plplot/files/patch-cmake_modules_instdirs.cmake
index a9b98637ae64..389c9836f889 100644
--- a/math/plplot/files/patch-cmake_modules_instdirs.cmake
+++ b/math/plplot/files/patch-cmake_modules_instdirs.cmake
@@ -1,6 +1,6 @@
---- ./cmake/modules/instdirs.cmake.orig 2009-09-06 21:04:43.000000000 +0200
-+++ ./cmake/modules/instdirs.cmake 2009-12-26 22:13:15.000000000 +0100
-@@ -61,13 +61,13 @@
+--- cmake/modules/instdirs.cmake.orig 2013-11-11 19:54:54.000000000 -0500
++++ cmake/modules/instdirs.cmake
+@@ -61,13 +61,13 @@ CACHE PATH "install location for C heade
set(
CMAKE_INSTALL_INFODIR
@@ -16,29 +16,29 @@
CACHE PATH "install location for man documentation"
)
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ CACHE PATH "install location for man doc
# cached values above.
# Data.
--set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION})
+-set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION})
+set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE})
# Libraries.
set(LIB_DIR ${CMAKE_INSTALL_LIBDIR})
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ set(BIN_DIR ${CMAKE_INSTALL_BINDIR})
set(SHLIB_DIR ${CMAKE_INSTALL_LIBDIR})
# Tcl files.
--set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION}/tcl)
+-set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}/tcl)
+set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}/tcl)
# Ada source files (*.adb, *.ads) (following recommendations in
# http://www.ada-france.org/debian/debian-ada-policy.html
-@@ -101,7 +101,7 @@
+@@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA
set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada${LIB_TAG})
# Drivers.
--set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${VERSION}/drivers${LIB_TAG})
+-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers${LIB_TAG})
+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers${LIB_TAG})
# Documentation.