summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-01-14 12:31:38 +0000
committerPatrick McHardy <kaber@trash.net>2014-01-14 12:31:38 +0000
commit7d98127b61f5e530388ff2344ace69a292a9829d (patch)
tree86292dd6142764e406821465db1950def498fd30 /files
parent3f8820318302da097795ba7d8b2ae3f6dff6cf2e (diff)
parent5e8f8a1807917f92e568437598670b0026462c1c (diff)
Merge remote-tracking branch 'origin/master' into next-3.14
Diffstat (limited to 'files')
-rw-r--r--files/Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/files/Makefile.in b/files/Makefile.in
index cd67c37d..dc237e23 100644
--- a/files/Makefile.in
+++ b/files/Makefile.in
@@ -1,4 +1,5 @@
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)/
+ $(SED) -i "s~#\! nft~#\!@sbindir@/nft~" $(DESTDIR)/$(confdir)/*