Fix Debian build

This commit is contained in:
Jochen Topf 2013-09-02 20:50:33 +02:00
parent 73c5bd159d
commit ee52133e05
3 changed files with 10 additions and 10 deletions

4
debian/rules vendored
View File

@ -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.

View File

@ -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

View File

@ -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