--- trunk/magellan-initscripts/Makefile	2006/04/12 23:16:25	365
+++ trunk/magellan-initscripts/Makefile	2008/03/22 19:59:32	694
@@ -1,5 +1,5 @@
 # Magellan Initscripts
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/Makefile,v 1.2 2006-04-12 23:16:25 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/Makefile,v 1.8 2008-03-22 19:59:32 niro Exp $
 
 CC=gcc
 CFLAGS=-Os -Wall
@@ -27,7 +27,6 @@
 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
@@ -39,7 +38,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:
@@ -56,7 +55,8 @@
 		protocols \
 		rc.config \
 		services \
-		shells; \
+		shells \
+		sysctl.conf; \
 	do \
 		install -m 0644 etc/$${file} $(DESTDIR)$(sysconfdir); \
 	done
@@ -65,14 +65,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-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
 
@@ -93,6 +91,7 @@
 		sendsignals \
 		setclock \
 		swap \
+		sysctl \
 		template; \
 	do \
 		install -m 0755 etc/rc.d/init.d/$${script} $(DESTDIR)$(initdir)/${script}; \
@@ -100,7 +99,7 @@
 
 
 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)