From 172b0f13421ee93a868efbbbe6f25f39a8ee2dd5 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 17 May 2019 15:01:26 +0800 Subject: [PATCH] remove libdir from pkg file --- debian/rules | 2 +- roojspacker/CMakeLists.txt | 2 +- roojspacker/roojspacker.pc.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 887094a..20669fb 100755 --- a/debian/rules +++ b/debian/rules @@ -24,5 +24,5 @@ # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 ) override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_INSTALL_DATADIR=share -DCMAKE_INSTALL_INCLUDEDIR=include/roojspacker + dh_auto_configure -- -DCMAKE_INSTALL_DATADIR=share diff --git a/roojspacker/CMakeLists.txt b/roojspacker/CMakeLists.txt index 25dedf7..85abf2b 100644 --- a/roojspacker/CMakeLists.txt +++ b/roojspacker/CMakeLists.txt @@ -138,7 +138,7 @@ install ( # DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/) INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ROOJSPACKER_PKG_NAME}.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/) + DESTINATION include) # Generate and install a pkg-config file diff --git a/roojspacker/roojspacker.pc.in b/roojspacker/roojspacker.pc.in index 5b282e2..3c30051 100644 --- a/roojspacker/roojspacker.pc.in +++ b/roojspacker/roojspacker.pc.in @@ -10,6 +10,6 @@ Name: roojspacker Description: Javascript packer Version: @VERSION@ Requires: glib-2.0 gobject-2.0 gee-0.8 gio-2.0 gthread-2.0 -Libs: -L${libdir} -lroojspacker-1.2 +Libs: -lroojspacker-1.2 Cflags: -I${includedir}/roojspacker -- 2.39.2