[osmpbf] 20/22: Fix Debian build

[Bas Couwenberg]

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

sebastic-guest pushed a commit to tag v1.3.1
in repository osmpbf.

commit ee52133e05b032d95e5454688d3718d4561581ec
Author: Jochen Topf <jochen at topf.org>
Date:   Mon Sep 2 20:50:33 2013 +0200

    Fix Debian build
---
 debian/rules   |  4 ++--
 src/Makefile   | 12 ++++++------
 tools/Makefile |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 093785a..9f5587f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,8 +46,8 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/libosmpbf-dev.
-	$(MAKE) -C src DESTDIR=$(CURDIR)/debian/libosmpbf-dev install
-	$(MAKE) -C tools DESTDIR=$(CURDIR)/debian/libosmpbf-dev install
+	$(MAKE) -C src DESTDIR=$(CURDIR)/debian/libosmpbf-dev PREFIX=/usr install
+	$(MAKE) -C tools DESTDIR=$(CURDIR)/debian/libosmpbf-dev PREFIX=/usr install
 
 
 # Build architecture-independent files here.
diff --git a/src/Makefile b/src/Makefile
index 52063b8..f621b96 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -19,12 +19,12 @@ libosmpbf.a: fileformat.pb.o osmformat.pb.o
 	cp *.pb.h ../include/osmpbf/
 
 install:
-	install -m 755 -d $(PREFIX)/lib
-	install -m 644 libosmpbf.a $(PREFIX)/lib
-	install -m 755 -d $(PREFIX)/include/osmpbf
-	install -m 644 ../include/osmpbf/osmpbf.h $(PREFIX)/include/osmpbf
-	install -m 644 ../include/osmpbf/fileformat.pb.h $(PREFIX)/include/osmpbf
-	install -m 644 ../include/osmpbf/osmformat.pb.h $(PREFIX)/include/osmpbf
+	install -m 755 -d $(DESTDIR)$(PREFIX)/lib
+	install -m 644 libosmpbf.a $(DESTDIR)$(PREFIX)/lib
+	install -m 755 -d $(DESTDIR)$(PREFIX)/include/osmpbf
+	install -m 644 ../include/osmpbf/osmpbf.h $(DESTDIR)$(PREFIX)/include/osmpbf
+	install -m 644 ../include/osmpbf/fileformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf
+	install -m 644 ../include/osmpbf/osmformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf
 
 clean:
 	rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a
diff --git a/tools/Makefile b/tools/Makefile
index 654a1c8..c435845 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,8 +13,8 @@ osmpbf-outline: osmpbf-outline.cpp
 	$(CXX) $(CXXFLAGS) -o $@ $< $(LDFLAGS)
 
 install:
-	install -m 755 -d $(PREFIX)/bin
-	install -m 644 -s osmpbf-outline $(PREFIX)/bin
+	install -m 755 -d $(DESTDIR)$(PREFIX)/bin
+	install -m 644 -s osmpbf-outline $(DESTDIR)$(PREFIX)/bin
 
 clean:
 	rm -f osmpbf-outline

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