--- trunk/magellan-initscripts/Makefile	2007/09/30 10:39:24	579
+++ trunk/magellan-initscripts/Makefile	2009/11/05 12:57:49	933
@@ -1,5 +1,5 @@
 # Magellan Initscripts
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/Makefile,v 1.6 2007-09-30 10:39:24 niro Exp $
+# $Id$
 
 CC=gcc
 CFLAGS=-Os -Wall
@@ -27,9 +27,7 @@
 create-dirs:
 	install -d -m 0755 $(DESTDIR)$(sysconfdir)
 	install -d -m 0755 $(DESTDIR)$(sysconfdir)/conf.d
-	install -d -m 0755 $(DESTDIR)$(sysconfdir)/modules.autoload.d
 	install -d -m 0755 $(DESTDIR)$(sysconfdir)/modules.d
-	install -d -m 0755 $(DESTDIR)$(sysconfdir)/sysconfig
 	install -d -m 0755 $(DESTDIR)$(rcdir)/rc0.d
 	install -d -m 0755 $(DESTDIR)$(rcdir)/rc1.d
 	install -d -m 0755 $(DESTDIR)$(rcdir)/rc2.d
@@ -39,7 +37,7 @@
 	install -d -m 0755 $(DESTDIR)$(rcdir)/rc6.d
 	install -d -m 0755 $(DESTDIR)$(rcdir)/rcsysinit.d
 	install -d -m 0755 $(DESTDIR)$(initdir)
-	install -d -m 0755 $(DESTDIR)$(libdir)/udev-state
+	install -d -m 0755 $(DESTDIR)$(libdir)/udev/state
 	install -d -m 0755 $(DESTDIR)$(sbindir)
 
 install-etc:
@@ -66,16 +64,12 @@
 
 install-confd:
 	install -m 0644 etc/conf.d/kernel $(DESTDIR)$(sysconfdir)/conf.d
-	install -m 0644 etc/conf.d/net.eth0 $(DESTDIR)$(sysconfdir)/conf.d
 	install -m 0644 etc/conf.d/net.routes $(DESTDIR)$(sysconfdir)/conf.d
 	install -m 0644 etc/conf.d/net.sample $(DESTDIR)$(sysconfdir)/conf.d
-	install -m 0644 etc/sysconfig/rc $(DESTDIR)$(sysconfdir)/sysconfig
+	install -m 0644 etc/conf.d/rc $(DESTDIR)$(sysconfdir)/conf.d
 
 install-modulesd:
-	install -m 0644 etc/modules.autoload.d/kernel-2.4 \
-		$(DESTDIR)$(sysconfdir)/modules.autoload.d
-	install -m 0644 etc/modules.autoload.d/kernel-2.6 \
-		$(DESTDIR)$(sysconfdir)/modules.autoload.d
+	install -m 0644 etc/modules.autoload $(DESTDIR)$(sysconfdir)
 	install -m 0644 etc/modules.d/aliases $(DESTDIR)$(sysconfdir)/modules.d
 	install -m 0644 etc/modules.d/i386 $(DESTDIR)$(sysconfdir)/modules.d
 
@@ -85,7 +79,6 @@
 		consolefont \
 		functions \
 		halt \
-		hwdetect \
 		loadkeys \
 		localnet \
 		modules \
@@ -97,14 +90,15 @@
 		setclock \
 		swap \
 		sysctl \
-		template; \
+		template \
+		udev; \
 	do \
 		install -m 0755 etc/rc.d/init.d/$${script} $(DESTDIR)$(initdir)/${script}; \
 	done
 
 
 install-udevd:
-	install -m 0644 lib/udev-state/devices.tar.bz2 $(DESTDIR)$(libdir)/udev-state
+	install -m 0644 lib/udev-state/devices.tar.bz2 $(DESTDIR)$(libdir)/udev/state
 
 install-bins:
 	install -m 0755 start-stop-daemon $(DESTDIR)$(sbindir)