[med-svn] [foomed] 01/03: update d/rules and fix lib/CMakeLists.txt

[Corentin Desfarges]

This is an automated email from the git hooks/post-receive script.

corentin-guest pushed a commit to branch master
in repository foomed.

commit 005d78bc8276901aefbac530fd2b47e5e83edbc8
Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
Date:   Fri Feb 20 10:46:13 2015 +0100

    update d/rules and fix lib/CMakeLists.txt
---
 debian/rules       | 8 +-------
 lib/CMakeLists.txt | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index a8b724e..1ad9f6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,16 +17,10 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 #export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 # package maintainers to append LDFLAGS
 
-DEB_LDFLAGS_MAINT_APPEND = "-Wl,--no-as-needed -Wl,-rpath=/usr/lib/corentin -ldl"
-
-
 # main packaging script based on dh7 syntax
 
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON
-
-override_dh_auto_install:
-	dh_auto_install
+	dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DCMAKE_INSTALL_RPATH="/usr/lib/corentin"
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9286894..aa56fcd 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_library( mylib SHARED lib.cpp )
+add_library(mylib SHARED lib.cpp)
 
-target_include_directories( mylib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} )
+target_include_directories(mylib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 INSTALL( TARGETS mylib LIBRARY DESTINATION lib/corentin )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/foomed.git