--- trunk/magellan-initscripts/Makefile	2011/03/11 17:47:53	1266
+++ trunk/magellan-initscripts/Makefile	2011/03/11 17:49:01	1267
@@ -61,20 +61,20 @@
 	echo "$$(date +%Y%m%d)-cvs" > $(DESTDIR)$(sysconfdir)/mageversion
 
 install-confd:
-	install -m 0644 etc/conf.d/clock $(DESTDIR)$(sysconfdir)/conf.d
-	install -m 0644 etc/conf.d/consolefont $(DESTDIR)$(sysconfdir)/conf.d
-	install -m 0644 etc/conf.d/editor $(DESTDIR)$(sysconfdir)/conf.d
-	install -m 0644 etc/conf.d/kernel $(DESTDIR)$(sysconfdir)/conf.d
-	install -m 0644 etc/conf.d/keymap $(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/conf.d/rc $(DESTDIR)$(sysconfdir)/conf.d
-	install -m 0644 etc/conf.d/xdm $(DESTDIR)$(sysconfdir)/conf.d
+	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.conf $(DESTDIR)$(sysconfdir)/modules.d
-	install -m 0644 etc/modules.d/i386.conf $(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 \
@@ -95,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)