From e56fe3ba630a2969e8dfaeccd126a4092facba82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 26 Nov 2014 09:08:52 +0100 Subject: [PATCH] Fix artsc-config script to return valid include directory Fix FTBFS on openbsd This resolves Bug 2160 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot (cherry picked from commit 775e3e4645343770d70538302d91c8adf83ac4b4) --- artsc/CMakeLists.txt | 8 +++++--- artsc/artsc-config.in | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/artsc/CMakeLists.txt b/artsc/CMakeLists.txt index 59833c1..71f8baa 100644 --- a/artsc/CMakeLists.txt +++ b/artsc/CMakeLists.txt @@ -17,8 +17,10 @@ add_definitions( -DCOMPILING_ARTSC ) set( prefix ${CMAKE_INSTALL_PREFIX} ) set( exec_prefix $prefix ) set( libdir ${LIB_INSTALL_DIR} ) -set( includedir ${INCLUDE_INSTALL_DIR} ) -set( LIBDL -l${DL_LIBRARIES} ) +set( includedir ${CMAKE_INSTALL_PREFIX}/include/artsc ) +if( NOT "${DL_LIBRARIES}" STREQUAL "" ) + set( LIBDL -l${DL_LIBRARIES} ) +endif( ) set( USE_THREADS ) set( LIBPTHREAD ${CMAKE_THREAD_LIBS_INIT} ) foreach( LIB ${GTHREAD2_LIBRARIES} ) @@ -57,7 +59,7 @@ include_directories( # FIXME: DESTINATION is currently a workaround install( FILES artsc.h ${CMAKE_CURRENT_BINARY_DIR}/artsc_export.h - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/artsc ) + DESTINATION ${includedir} ) ##### artsdsp (shared lib) ###################### diff --git a/artsc/artsc-config.in b/artsc/artsc-config.in index 822b6b8..1f1cff6 100755 --- a/artsc/artsc-config.in +++ b/artsc/artsc-config.in @@ -18,7 +18,7 @@ EOH prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@c +includedir=@includedir@ libdl=@LIBDL@ flags=""