--- trunk/magellan-initscripts/Makefile	2008/03/22 18:57:35	693
+++ trunk/magellan-initscripts/Makefile	2011/03/11 17:49:01	1267
@@ -1,5 +1,5 @@
 # Magellan Initscripts
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/Makefile,v 1.7 2008-03-22 18:57:35 niro Exp $
+# $Id$
 
 CC=gcc
 CFLAGS=-Os -Wall
@@ -28,7 +28,6 @@
 	install -d -m 0755 $(DESTDIR)$(sysconfdir)
 	install -d -m 0755 $(DESTDIR)$(sysconfdir)/conf.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
@@ -38,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:
@@ -53,7 +52,6 @@
 		passwd \
 		profile \
 		protocols \
-		rc.config \
 		services \
 		shells \
 		sysctl.conf; \
@@ -62,17 +60,21 @@
 	done
 	echo "$$(date +%Y%m%d)-cvs" > $(DESTDIR)$(sysconfdir)/mageversion
 
-
 install-confd:
-	install -m 0644 etc/conf.d/kernel $(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 conf.d/clock $(DESTDIR)$(sysconfdir)/conf.d
+	install -m 0644 conf.d/consolefont $(DESTDIR)$(sysconfdir)/conf.d
+	install -m 0644 conf.d/editor $(DESTDIR)$(sysconfdir)/conf.d
+	install -m 0644 conf.d/kernel $(DESTDIR)$(sysconfdir)/conf.d
+	install -m 0644 conf.d/keymap $(DESTDIR)$(sysconfdir)/conf.d
+	install -m 0644 conf.d/net.routes $(DESTDIR)$(sysconfdir)/conf.d
+	install -m 0644 conf.d/net.sample $(DESTDIR)$(sysconfdir)/conf.d
+	install -m 0644 conf.d/rc $(DESTDIR)$(sysconfdir)/conf.d
+	install -m 0644 conf.d/xdm $(DESTDIR)$(sysconfdir)/conf.d
 
 install-modulesd:
 	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
+	install -m 0644 modules.d/aliases.conf $(DESTDIR)$(sysconfdir)/modules.d
+	install -m 0644 modules.d/i386.conf $(DESTDIR)$(sysconfdir)/modules.d
 
 install-initd:
 	for script in checkfs \
@@ -80,7 +82,6 @@
 		consolefont \
 		functions \
 		halt \
-		hwdetect \
 		loadkeys \
 		localnet \
 		modules \
@@ -94,12 +95,11 @@
 		sysctl \
 		template; \
 	do \
-		install -m 0755 etc/rc.d/init.d/$${script} $(DESTDIR)$(initdir)/${script}; \
+		install -m 0755 rc/$${script} $(DESTDIR)$(initdir)/${script}; \
 	done
 
-
 install-udevd:
-	install -m 0644 lib/udev-state/devices.tar.bz2 $(DESTDIR)$(libdir)/udev-state
+	install -m 0644 udev-state/devices.tar.bz2 $(DESTDIR)$(libdir)/udev/state
 
 install-bins:
 	install -m 0755 start-stop-daemon $(DESTDIR)$(sbindir)