[sosi2osm] 11/19: Fixed more things

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository sosi2osm.

commit a935087100359abf1b2e5d93401ae6f2d2a2478e
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Sep 5 17:35:47 2014 +0000

    Fixed more things
---
 debian/patches/01_fix_libsearchpath.patch | 7 ++++---
 debian/rules                              | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/patches/01_fix_libsearchpath.patch b/debian/patches/01_fix_libsearchpath.patch
index 4dab12f..db88e25 100644
--- a/debian/patches/01_fix_libsearchpath.patch
+++ b/debian/patches/01_fix_libsearchpath.patch
@@ -2,12 +2,13 @@ Index: sosi2osm/Makefile
 ===================================================================
 --- sosi2osm.orig/Makefile
 +++ sosi2osm/Makefile
-@@ -1,7 +1,7 @@
+@@ -1,8 +1,8 @@
  PROGNAME=sosi2osm
  OBJFILES=sosi2osm.o sosi.o tag.o node.o
  
 -CPPFLAGS = -I/usr/local/include/fyba -I/usr/include/fyba/ `pkg-config --cflags lua5.1-c++` -DLINUX -DUNIX -g
-+CPPFLAGS = -I/usr/include/fyba `pkg-config --cflags lua5.1-c++` -DLINUX -DUNIX -g
- LDFLAGS = -lfyba -lfygm -lfyut -lproj `pkg-config --libs lua5.1-c++`
++CPPFLAGS = `pkg-config --cflags lua5.1-c++ fyba` -DLINUX -DUNIX -g
+-LDFLAGS = -lfyba -lfygm -lfyut -lproj `pkg-config --libs lua5.1-c++`
++LDFLAGS := $(LDFLAGS) -lproj `pkg-config --libs lua5.1-c++ fyba`
  
  all: $(PROGNAME)
diff --git a/debian/rules b/debian/rules
index fa48316..94c554d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
 %:
 	dh $@ 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sosi2osm.git