initscripts: Move everything to /usr.

diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index 65119160d145de5df0a299bfc23eb1bda7a5318e..ede6bd92c59576e0565cba1a8e5b716b5e28ed0e 100644 (file)
--- 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 a6b0f3135db9c3ba730ffacab1ca7e7064e8a4ff..c357d6edb68baf48b4b698a0598730a0177d47b0 100644 (file)
--- 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