From 23cab09e07fdd059b73e3d5b3896e701410b0139 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 28 Feb 2012 17:44:49 +0000 Subject: [PATCH] fix assumptions that OPENJPEG_INSTALL_*_DIR aren't relative paths --- CMakeLists.txt | 2 +- libopenjpeg1.pc.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 213c306c..a7b6d838 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,7 @@ IF(UNIX) ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig ) INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" - \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")") ENDIF(UNIX) #----------------------------------------------------------------------------- diff --git a/libopenjpeg1.pc.cmake b/libopenjpeg1.pc.cmake index 5b8bde1c..35f8ac5a 100644 --- a/libopenjpeg1.pc.cmake +++ b/libopenjpeg1.pc.cmake @@ -1,8 +1,8 @@ prefix=@CMAKE_INSTALL_PREFIX@ -bindir=@OPENJPEG_INSTALL_BIN_DIR@ -datadir=@OPENJPEG_INSTALL_DATA_DIR@ -libdir=@OPENJPEG_INSTALL_LIB_DIR@ -includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@ +bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ +datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@ +libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@ Name: openjpeg Description: JPEG2000 files library