Changed distribution directory structure.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9530 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

bootscripts/contrib/lsb-v3/Makefile

@@ -16,50 +16,45 @@ create-dirs:
 	install -d -m ${DIRMODE} ${EXTDIR}/rc6.d
 	install -d -m ${DIRMODE} ${EXTDIR}/rcS.d
 	install -d -m ${DIRMODE} ${EXTDIR}/init.d
-	install -d -m ${DIRMODE} ${EXTDIR}/sysconfig
+	install -d -m ${DIRMODE} ${EXTDIR}/default
 	install -d -m ${DIRMODE} ${DESTDIR}/lib/lsb
 	install -d -m ${DIRMODE} ${EXTDIR}/lsb/state
+	install -d -m ${DIRMODE} ${DESTDIR}/lib/network-services
 
-create-service-dir:
+install: create-dirs
-	install -d -m ${DIRMODE} ${EXTDIR}/sysconfig/network-devices/services
+	install -m ${MODE} etc/init.d/checkfs               ${EXTDIR}/init.d/
-
+	install -m ${MODE} etc/init.d/cleanfs               ${EXTDIR}/init.d/
-create-boottemp-dir:
+	install -m ${CONFMODE} etc/init.d/lfs-functions     ${EXTDIR}/init.d/
-	install -d -m ${DIRMODE} ${EXTDIR}/init.d/boottemp
+	install -m ${MODE} etc/init.d/halt                  ${EXTDIR}/init.d/
-
+	install -m ${MODE} etc/init.d/console               ${EXTDIR}/init.d/
-install: create-dirs create-service-dir create-boottemp-dir
+	install -m ${MODE} etc/init.d/localnet              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/checkfs               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/modules               ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/cleanfs               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/mountfs               ${EXTDIR}/init.d/
-	install -m ${CONFMODE} init.d/lfs-functions     ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/mountvirtfs           ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/halt                  ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/network               ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/console               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/rc                    ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/localnet              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/reboot                ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/modules               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/sendsignals           ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/mountfs               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/setclock              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/mountvirtfs           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/sysklogd              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/network               ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/swap                  ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/rc                    ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/sysctl                ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/reboot                ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/template              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/sendsignals           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/udev                  ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/setclock              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/udev_retry            ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/sysklogd              ${EXTDIR}/init.d/
+	install -m ${CONFMODE} lib/lsb/init-functions       ${DESTDIR}/lib/lsb/
-	install -m ${MODE} init.d/swap                  ${EXTDIR}/init.d/
+	install -m ${CONFMODE} lib/lsb/manage-functions     ${DESTDIR}/lib/lsb/
-	install -m ${MODE} init.d/sysctl                ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/template              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/udev                  ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/udev_retry            ${EXTDIR}/init.d/
-	install -m ${CONFMODE} lsb/init-functions       ${DESTDIR}/lib/lsb/
-	install -m ${CONFMODE} lsb/manage-functions     ${DESTDIR}/lib/lsb/
 	install -m ${CONFMODE} etc/lsb-config           ${EXTDIR}/lsb/
-	if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
+	if [ ! -f ${EXTDIR}/default/createfiles ]; then install -m ${CONFMODE} etc/default/createfiles ${EXTDIR}/default/; fi
-	if [ ! -f ${EXTDIR}/sysconfig/modules     ]; then install -m ${CONFMODE} sysconfig/modules     ${EXTDIR}/sysconfig/; fi
+	if [ ! -f ${EXTDIR}/default/modules     ]; then install -m ${CONFMODE} etc/default/modules     ${EXTDIR}/default/; fi
-	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} sysconfig/rc          ${EXTDIR}/sysconfig/; fi
+	if [ ! -f ${EXTDIR}/default/rc          ]; then install -m ${CONFMODE} etc/default/rc          ${EXTDIR}/default/; fi
-	if [ ! -f ${EXTDIR}/sysconfig/rc.site     ]; then install -m ${CONFMODE} sysconfig/rc.site     ${EXTDIR}/sysconfig/; fi
+	if [ ! -f ${EXTDIR}/default/rc.site     ]; then install -m ${CONFMODE} etc/default/rc.site     ${EXTDIR}/default/; fi
 	if [ -f   ${EXTDIR}/inittab               ]; then install -m ${CONFMODE} ${EXTDIR}/inittab     ${EXTDIR}/inittab.bak; fi
 	install                   -m ${CONFMODE} etc/inittab ${EXTDIR}/
-	install                   -m ${MODE} sysconfig/network-devices/ifup   ${EXTDIR}/sysconfig/network-devices/
+	install                   -m ${MODE} sbin/ifup   ${DESTDIR}/sbin/
-	install                   -m ${MODE} sysconfig/network-devices/ifdown ${EXTDIR}/sysconfig/network-devices/
+	install                   -m ${MODE} sbin/ifdown ${DESTDIR}/sbin/
-	install                   -m ${MODE} sysconfig/network-devices/services/ipv4-static       ${EXTDIR}/sysconfig/network-devices/services/
+	install                   -m ${MODE} lib/network-services/ipv4-static       ${DESTDIR}/lib/network-services/
-	install                   -m ${MODE} sysconfig/network-devices/services/ipv4-static-route ${EXTDIR}/sysconfig/network-devices/services/
+	install                   -m ${MODE} lib/network-services/ipv4-static-route ${DESTDIR}/lib/network-services/
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/checkfs
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/cleanfs
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/halt
@@ -77,24 +72,24 @@ install: create-dirs create-service-dir create-boottemp-dir
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev_retry
 
-minimal: create-dirs create-service-dir create-boottemp-dir
+minimal: create-dirs
-	install -m ${MODE} init.d/checkfs           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/checkfs           ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/cleanfs           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/cleanfs           ${EXTDIR}/init.d/
-	install -m ${CONFMODE} init.d/lfs-functions ${EXTDIR}/init.d/
+	install -m ${CONFMODE} etc/init.d/lfs-functions ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/halt              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/halt              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/localnet          ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/localnet          ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/mountfs           ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/mountfs           ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/mountvirtfs       ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/mountvirtfs       ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/rc                ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/rc                ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/reboot            ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/reboot            ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/sendsignals       ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/sendsignals       ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/setclock          ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/detclock          ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/swap              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/swap              ${EXTDIR}/init.d/
-	install -m ${MODE} init.d/udev              ${EXTDIR}/init.d/
+	install -m ${MODE} etc/init.d/udev              ${EXTDIR}/init.d/
-	install -m ${CONFMODE} lsb/init-functions   ${DESTDIR}/lib/lsb/
+	install -m ${CONFMODE} lib/lsb/init-functions   ${DESTDIR}/lib/lsb/
-	install -m ${CONFMODE} lsb/manage-functions ${DESTDIR}/lib/lsb/
+	install -m ${CONFMODE} lib/lsb/manage-functions ${DESTDIR}/lib/lsb/
 	install -m ${CONFMODE} etc/lsb-config       ${EXTDIR}/lsb/
-	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} sysconfig/rc          ${EXTDIR}/sysconfig/; fi
+	if [ ! -f ${EXTDIR}/default/rc          ]; then install -m ${CONFMODE} default/rc          ${EXTDIR}/default/; fi
 	if [ -f   ${EXTDIR}/inittab               ]; then install -m ${CONFMODE} ${EXTDIR}/inittab     ${EXTDIR}/inittab.bak; fi
 	install                   -m ${CONFMODE} etc/inittab ${EXTDIR}/
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/checkfs
@@ -105,10 +100,8 @@ minimal: create-dirs create-service-dir create-boottemp-dir
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/mountvirtfs
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/reboot
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/sendsignals
-	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/setclock
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/swap
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev
 
-.PHONY: all create-dirs create-service-dir create-boottemp-dir \
+.PHONY: all create-dirs install minimal
-	install minimal