Index: libs/libosm/osmshp.cpp
===================================================================
--- libs/libosm/osmshp.cpp	(revision 2100)
+++ libs/libosm/osmshp.cpp	(working copy)
@@ -1,5 +1,5 @@
 #include "osmshp.h"
-#include <libshp/shapefil.h>
+#include <shapefil.h>
 #include "Node.h"
 #include "Components.h"
 #include "Parser.h"
Index: libs/libosm/Components.cpp
===================================================================
--- libs/libosm/Components.cpp	(revision 2100)
+++ libs/libosm/Components.cpp	(working copy)
@@ -24,7 +24,7 @@
 #include <iomanip>
 #include <string>
 #include <sstream>
-#include <libshp/shapefil.h>
+#include <shapefil.h>
 #include "Node.h"
 #include "Parser.h"
 #include "Way.h"
Index: libs/libosm/Makefile
===================================================================
--- libs/libosm/Makefile	(revision 2100)
+++ libs/libosm/Makefile	(working copy)
@@ -1,5 +1,5 @@
-CXXFLAGS = -I/home/nick/expat -I/home/nick/shapelib/include -I../ccoord
-LDFLAGS = -L/home/nick/expat/lib -lexpat -lcurl  /home/nick/shapelib/lib/libshp.a
+CXXFLAGS = -I../ccoord
+LDFLAGS = -lexpat -lcurl -lshp
 OBJ = Object.o Way.o Parser.o Components.o functions.o llgr.o RulesParser.o
 NETOBJ = Client.o
 TESTOBJ = test.o
Index: utils/srtmshp/SRTMConGen.cpp
===================================================================
--- utils/srtmshp/SRTMConGen.cpp	(revision 2100)
+++ utils/srtmshp/SRTMConGen.cpp	(working copy)
@@ -20,7 +20,7 @@
 #include "Map.h"
 #include "llgr.h"
 #include <cmath>
-#include <libshp/shapefil.h>
+#include <shapefil.h>
 
 using OSM::EarthPoint;
 
Index: utils/srtmshp/Makefile
===================================================================
--- utils/srtmshp/Makefile	(revision 2100)
+++ utils/srtmshp/Makefile	(working copy)
@@ -1,5 +1,5 @@
-CXXFLAGS = -I/home/nick/shapelib/include  -I/home/nick/src/libs/libosm
-LDFLAGS = -L/home/nick/shapelib/lib /home/nick/shapelib/lib/libshp.a  /home/nick/src/libs/libosm/libosm.a /home/nick/src/libs/ccoord/libccoord.a
+CXXFLAGS =  -I../../libs/libosm
+LDFLAGS = -L../../libs/libosm -L../../libs/ccoord -lshp -losm -lccoord
 OBJ = srtm2shp.o SRTMGeneral.o SRTMDataGrid.o SRTMConGen.o 
 
 srtm2shp: $(OBJ)
