remove libdir from pkg file
authorAlan Knowles <alan@roojs.com>
Fri, 17 May 2019 07:01:26 +0000 (15:01 +0800)
committerAlan Knowles <alan@roojs.com>
Fri, 17 May 2019 07:01:26 +0000 (15:01 +0800)
debian/rules
roojspacker/CMakeLists.txt
roojspacker/roojspacker.pc.in

index 887094a..20669fb 100755 (executable)
@@ -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
 
index 25dedf7..85abf2b 100644 (file)
@@ -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
index 5b282e2..3c30051 100644 (file)
@@ -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