[osmpbf] 16/22: merged

[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 3d5dd4b7bbf6a35833e53798d0179f9530a65d65
Merge: 538425c b8266ac
Author: Scott Crosby <scrosby at cs.rice.edu>
Date:   Mon Sep 2 12:15:24 2013 -0500

    merged

 src/Makefile   | 18 ++++++++++--------
 tools/Makefile |  7 +++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --cc src/Makefile
index af00d80,e850edd..52063b8
--- a/src/Makefile
+++ b/src/Makefile
@@@ -1,8 -1,9 +1,10 @@@
  
 -DESTDIR ?= /usr/local
++PREFIX ?= /usr/local
  CXX ?= g++
 -CXXFLAGS ?= -O3
 +CXXFLAGS ?= -O3 -fPIC
 +
- AR = ar
+ AR ?= ar
+ PROTOC ?= protoc
  
  all: libosmpbf.a ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h
  
@@@ -17,12 -18,12 +19,12 @@@ libosmpbf.a: fileformat.pb.o osmformat.
  	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 -d $(DESTDIR)/lib
 -	install -m 644 libosmpbf.a $(DESTDIR)/lib
 -	install -m 755 -d $(DESTDIR)/include/osmpbf
 -	install -m 644 ../include/osmpbf/osmpbf.h $(DESTDIR)/include/osmpbf
 -	install -m 644 ../include/osmpbf/fileformat.pb.h $(DESTDIR)/include/osmpbf
 -	install -m 644 ../include/osmpbf/osmformat.pb.h $(DESTDIR)/include/osmpbf
++	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
  
  clean:
  	rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a
diff --cc tools/Makefile
index f09499b,a4e3ab4..654a1c8
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -1,17 -1,17 +1,20 @@@
  
 -DESTDIR ?= /usr/local
++PREFIX ?= /usr/local
  CXX ?= g++
 -CXXFLAGS ?= -g -I../include
 -LDFLAGS ?= -L../src -lpthread -lz -lprotobuf-lite -losmpbf
 +CXXFLAGS ?= -g
 +CXXFLAGS += -I../include
 +LDFLAGS += -L../src -pthread -lz -lprotobuf-lite -losmpbf
 +
++
+ 
  all: osmpbf-outline
  
  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 -d $(DESTDIR)/bin
 -	install -m 644 -s osmpbf-outline $(DESTDIR)/bin
++	install -m 755 -d $(PREFIX)/bin
++	install -m 644 -s osmpbf-outline $(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