From 3846787973f05afde74531721e64f26fe3aa9c04 Mon Sep 17 00:00:00 2001 From: woglinde Date: Tue, 5 Jul 2011 20:56:34 +0000 Subject: [PATCH] Fix:map_shapefile: Use top_builddir instead of top_srcdir and libadd instead of ldflags git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4588 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/map/shapefile/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/navit/navit/map/shapefile/Makefile.am b/navit/navit/map/shapefile/Makefile.am index ba6e228..6b6c1fa 100644 --- a/navit/navit/map/shapefile/Makefile.am +++ b/navit/navit/map/shapefile/Makefile.am @@ -8,8 +8,8 @@ endif libmap_shapefile_la_SOURCES = shapefile.c libmap_shapefile_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ if HAVE_SYSTEM_SHAPEFILELIB -libmap_shapefile_la_LDFLAGS += @SHAPEFILE_LIBS@ +libmap_shapefile_la_LIBADD = @SHAPEFILE_LIBS@ else AM_CPPFLAGS += -I$(top_srcdir)/navit/support/shapefile -libmap_shapefile_la_LDFLAGS += $(top_srcdir)/navit/support/shapefile/libsupport_shapefile.la +libmap_shapefile_la_LIBADD = $(top_builddir)/navit/support/shapefile/libsupport_shapefile.la endif -- 2.7.4