From: Alan Knowles <alan@roojs.com>
Date: Fri, 17 May 2019 02:42:46 +0000 (+0800)
Subject: fix to ensure debian packages can be made
X-Git-Tag: release-1.5~24
X-Git-Url: http://git.roojs.org/?p=roojspacker;a=commitdiff_plain;h=35a072e444f1a37af73a4d8023ab200dd7fde120

fix to ensure debian packages can be made
---

diff --git a/debian/rules b/debian/rules
index 2d8809e..f0932a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # See debhelper(7) (uncomment to enable)
 # output every command that modifies files on the build system.
-export DH_VERBOSE = 1
+#export DH_VERBOSE = 1
 
 
 # see FEATURE AREAS in dpkg-buildflags(1)
@@ -13,8 +13,8 @@ export DH_VERBOSE = 1
 # package maintainers to append LDFLAGS
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-override_dh_auto_test:
-override_dh_usrlocal:
+#override_dh_auto_test:
+#override_dh_usrlocal:
 
 
 %:
@@ -23,6 +23,6 @@ override_dh_usrlocal:
 
 # dh_make generated override targets
 # This is example for Cmake (See https://bugs.debian.org/641051 )
-override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) -DCMAKE_INSTALL_BINDIR=$(DEB_HOST_MULTIARCH)/bin -DCMAKE_INSTALL_LIBDIR=$(DEB_HOST_MULTIARCH)/lib
+#override_dh_auto_configure:
+#	dh_auto_configure -- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) -DCMAKE_INSTALL_BINDIR=$(DEB_HOST_MULTIARCH)/bin -DCMAKE_INSTALL_LIBDIR=$(DEB_HOST_MULTIARCH)/lib
 
diff --git a/roojspacker/CMakeLists.txt b/roojspacker/CMakeLists.txt
index 405d203..8338a36 100644
--- a/roojspacker/CMakeLists.txt
+++ b/roojspacker/CMakeLists.txt
@@ -129,9 +129,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ROOJSPACKER_PKG_NAME}.vapi
 # Install the library
 install (
     TARGETS ${ROOJSPACKER_LIBRARY_NAME}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}  # On Windows, the DLL goes in the same place as the executables
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}  # This is where shared libraries (*.so on Linux, *.dynlib on OS X)
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) # Finally, this is where static libraries (*.a) go
+    RUNTIME DESTINATION bin  # On Windows, the DLL goes in the same place as the executables
+    LIBRARY DESTINATION lib  # This is where shared libraries (*.so on Linux, *.dynlib on OS X)
+    ARCHIVE DESTINATION lib) # Finally, this is where static libraries (*.a) go
 
 # Install the C header
 #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ROOJSPACKER_PKG_NAME}.h