From b566123b9b60aff8ef21dfa7b21f817261236b1d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 13 Jan 2014 06:36:45 +0000 Subject: nftables: drop hard coded install using root user owner and group Packaging systems build as a non priv user, so can't install as root. Users installing from source can 'sudo make install' or run 'make install' as root Signed-off-by: Kevin Fenzi Signed-off-by: Patrick McHardy --- Makefile.rules.in | 2 +- doc/Makefile.in | 4 ++-- files/Makefile.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.rules.in b/Makefile.rules.in index a93a26bd..25988dd7 100644 --- a/Makefile.rules.in +++ b/Makefile.rules.in @@ -61,7 +61,7 @@ clean_targets += $(1)-clean $(1)-install: @echo -e " INSTALL\t$1" $(MKDIR_P) $$(DESTDIR)/$$($(1)-destdir) - $(INSTALL) -m 755 -o root -g root \ + $(INSTALL) -m 755 -p \ $(SUBDIR)$(1) \ $$(DESTDIR)/$$($(1)-destdir)/$(1) install_targets += $(1)-install diff --git a/doc/Makefile.in b/doc/Makefile.in index 2c42d7e5..e0732adb 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -10,11 +10,11 @@ install: $(mandocs-y) $(pdfdocs-y) @echo -e " INSTALL\tdoc" if test -n "$(mandocs-y)"; then \ $(MKDIR_P) $(DESTDIR)/${mandir}/man8 ;\ - $(INSTALL) -m 755 -o root -g root $(mandocs-y) \ + $(INSTALL) -m 755 -p $(mandocs-y) \ $(DESTDIR)/${mandir}/man8/ ;\ fi if test -n "$(pdfdocs-y)"; then \ $(MKDIR_P) $(DESTDIR)/${pdfdir} ;\ - $(INSTALL) -m 755 -o root -g root $(pdfdocs-y) \ + $(INSTALL) -m 755 -p $(pdfdocs-y) \ $(DESTDIR)/${pdfdir}/ ;\ fi diff --git a/files/Makefile.in b/files/Makefile.in index cd67c37d..c3643df2 100644 --- a/files/Makefile.in +++ b/files/Makefile.in @@ -1,4 +1,4 @@ install: @echo -e " INSTALL\tfiles" $(MKDIR_P) $(DESTDIR)/$(confdir) - $(INSTALL) -m 755 -o root -g root $(SUBDIR)nftables/* $(DESTDIR)/$(confdir)/ + $(INSTALL) -m 755 -p $(SUBDIR)nftables/* $(DESTDIR)/$(confdir)/ -- cgit v1.2.3