[osmpbf] 04/22: Install to /usr/local per default

[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 1cbcd0078eccac78732b409712a215d87f56e903
Author: Thomas Friebel <yaron at codefreax.com>
Date:   Fri Mar 8 22:27:09 2013 +0100

    Install to /usr/local per default
---
 src/Makefile   | 13 +++++++------
 tools/Makefile |  5 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index bb8d035..aea692f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,5 @@
 
+DESTDIR ?= /usr/local
 CXX ?= g++
 CXXFLAGS ?= -O3
 AR ?= ar
@@ -17,12 +18,12 @@ libosmpbf.a: fileformat.pb.o osmformat.pb.o
 	cp *.pb.h ../include/osmpbf/
 
 install:
-	install -m 755 -g root -o root -d $(DESTDIR)/usr/lib
-	install -m 644 -g root -o root libosmpbf.a $(DESTDIR)/usr/lib
-	install -m 755 -g root -o root -d $(DESTDIR)/usr/include/osmpbf
-	install -m 644 -g root -o root ../include/osmpbf/osmpbf.h $(DESTDIR)/usr/include/osmpbf
-	install -m 644 -g root -o root ../include/osmpbf/fileformat.pb.h $(DESTDIR)/usr/include/osmpbf
-	install -m 644 -g root -o root ../include/osmpbf/osmformat.pb.h $(DESTDIR)/usr/include/osmpbf
+	install -m 755 -g root -o root -d $(DESTDIR)/lib
+	install -m 644 -g root -o root libosmpbf.a $(DESTDIR)/lib
+	install -m 755 -g root -o root -d $(DESTDIR)/include/osmpbf
+	install -m 644 -g root -o root ../include/osmpbf/osmpbf.h $(DESTDIR)/include/osmpbf
+	install -m 644 -g root -o root ../include/osmpbf/fileformat.pb.h $(DESTDIR)/include/osmpbf
+	install -m 644 -g root -o root ../include/osmpbf/osmformat.pb.h $(DESTDIR)/include/osmpbf
 
 clean:
 	rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a
diff --git a/tools/Makefile b/tools/Makefile
index db134fc..9112867 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,5 @@
 
+DESTDIR ?= /usr/local
 CXX ?= g++
 CXXFLAGS ?= -g -I../include
 LDFLAGS ?= -L../src -lpthread -lz -lprotobuf-lite -losmpbf
@@ -9,8 +10,8 @@ osmpbf-outline: osmpbf-outline.cpp
 	$(CXX) $(CXXFLAGS) -o $@ $< $(LDFLAGS)
 
 install:
-	install -m 755 -g root -o root -d $(DESTDIR)/usr/bin
-	install -m 644 -g root -o root -s osmpbf-outline $(DESTDIR)/usr/bin
+	install -m 755 -g root -o root -d $(DESTDIR)/bin
+	install -m 644 -g root -o root -s osmpbf-outline $(DESTDIR)/bin
 
 clean:
 	rm -f osmpbf-outline

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