From 76987ebfe6493aa51ed972ee9dc732ac9cfc963b Mon Sep 17 00:00:00 2001 From: Thomas Friebel Date: Fri, 8 Mar 2013 22:24:11 +0100 Subject: [PATCH] Do not set file user:group to 'root:root' during installation When run as root, files will be 'root:root' anyway. When run as user changing user:group will fail. Furthermore, the group 'root' is not available on all systems. --- src/Makefile | 12 ++++++------ tools/Makefile | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index aea692f..efff2bd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,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)/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 + install -m 755 -d $(DESTDIR)/usr/lib + install -m 644 libosmpbf.a $(DESTDIR)/usr/lib + install -m 755 -d $(DESTDIR)/usr/include/osmpbf + install -m 644 ../include/osmpbf/osmpbf.h $(DESTDIR)/usr/include/osmpbf + install -m 644 ../include/osmpbf/fileformat.pb.h $(DESTDIR)/usr/include/osmpbf + install -m 644 ../include/osmpbf/osmformat.pb.h $(DESTDIR)/usr/include/osmpbf clean: rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a diff --git a/tools/Makefile b/tools/Makefile index 9112867..f175577 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,8 +10,8 @@ osmpbf-outline: osmpbf-outline.cpp $(CXX) $(CXXFLAGS) -o $@ $< $(LDFLAGS) install: - install -m 755 -g root -o root -d $(DESTDIR)/bin - install -m 644 -g root -o root -s osmpbf-outline $(DESTDIR)/bin + install -m 755 -d $(DESTDIR)/usr/bin + install -m 644 -s osmpbf-outline $(DESTDIR)/usr/bin clean: rm -f osmpbf-outline