From 620459d13810510944f28c909f6f614d190ac420 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Apr 2012 01:24:50 +0200
Subject: [PATCH] initscripts: Move everything to /usr.

---
 initscripts/initscripts.nm | 12 +++++++++---
 initscripts/src/Makefile   |  7 ++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index 65119160d..ede6bd92c 100644
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -6,7 +6,7 @@
 name       = initscripts
 epoch      = 1
 version    = 2.99
-release    = 14
+release    = 15
 
 groups     = System/Boot
 url        =
@@ -25,6 +25,8 @@ build
 	requires
 		glib2-devel
 		popt-devel
+		shadow-utils
+		systemd-units
 	end
 
 	DIR_APP = %{DIR_SOURCE}
@@ -48,8 +50,8 @@ build
 		install -v -m 755 %{DIR_SOURCE}/rc.local %{BUILDROT}/etc/rc.local
 
 		# Install udev rules
-		mkdir -pv %{BUILDROOT}/lib/udev/rules.d/
-		cp -vf %{DIR_SOURCE}/udev/* %{BUILDROOT}/lib/udev/rules.d/
+		mkdir -pv %{BUILDROOT}%{prefix}/lib/udev/rules.d/
+		cp -vf %{DIR_SOURCE}/udev/* %{BUILDROOT}%{prefix}/lib/udev/rules.d/
 	end
 end
 
@@ -71,6 +73,10 @@ packages
 			util-linux
 		end
 
+		conflicts
+			filesystem  < 002
+		end
+
 		configfiles
 			/etc/rc.local
 		end
diff --git a/initscripts/src/Makefile b/initscripts/src/Makefile
index a6b0f3135..c357d6edb 100644
--- a/initscripts/src/Makefile
+++ b/initscripts/src/Makefile
@@ -3,6 +3,7 @@ PROGS = ipcalc securetty
 
 CC = gcc
 CFLAGS += -D_GNU_SOURCE $(shell pkg-config --cflags glib-2.0)
+prefix ?= /usr
 
 all: $(PROGS)
 
@@ -14,9 +15,9 @@ test: ipcalc
 
 install: $(PROGS)
 	# Install binaries
-	-mkdir -pv $(DESTDIR)/lib/udev $(DESTDIR)/{,s}bin
-	install -v -m 755 ipcalc $(DESTDIR)/bin
-	install -v -m 755 securetty $(DESTDIR)/sbin
+	-mkdir -pv $(DESTDIR)$(prefix)/lib/udev $(DESTDIR)$(prefix)/{,s}bin
+	install -v -m 755 ipcalc $(DESTDIR)$(prefix)/bin
+	install -v -m 755 securetty $(DESTDIR)$(prefix)/sbin
 
 	# Install man pages
 	-mkdir -pv $(DESTDIR)/usr/share/man/man1
-- 
2.39.5