From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Nov 2011 13:55:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/network
X-Git-Tag: 004~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ab1debd8941c36735fbf2cb6d7bc4fae981b162;p=network.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/network

Conflicts:
	Makefile
---

8ab1debd8941c36735fbf2cb6d7bc4fae981b162
diff --cc Makefile
index 63d65c95,c6c83bf7..8ca81f31
--- a/Makefile
+++ b/Makefile
@@@ -11,10 -11,9 +11,9 @@@ all
  	@echo "Nothing to do here."
  
  install:
 -	-mkdir -pv $(DESTDIR)/etc/{network,ppp}
 +	-mkdir -pv $(DESTDIR)/etc/{network/{ports,zones},ppp}
- 	-mkdir -pv $(DESTDIR)/lib/{network,udev}
+ 	-mkdir -pv $(DESTDIR)/lib/{network,sysctl.d,udev}
  	-mkdir -pv $(DESTDIR)/sbin
- 	-mkdir -pv $(DESTDIR)/usr/lib/sysctl.d
  	-mkdir -pv $(DESTDIR)/var/log/network
  
  	install -m 755 -v network $(DESTDIR)/sbin