r1040 - trunk/udev

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Jan 11 22:21:05 PST 2006


Author: jim
Date: 2006-01-11 23:21:05 -0700 (Wed, 11 Jan 2006)
New Revision: 1040

Modified:
   trunk/udev/
   trunk/udev/Makefile
Log:
 r1348 at server:  jim | 2006-01-11 22:20:45 -0800
 Updates to Makefile



Property changes on: trunk/udev
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/udev:1343
   + 3949c430-d905-0410-97b6-f115d20341b5:/udev:1348

Modified: trunk/udev/Makefile
===================================================================
--- trunk/udev/Makefile	2006-01-12 01:12:52 UTC (rev 1039)
+++ trunk/udev/Makefile	2006-01-12 06:21:05 UTC (rev 1040)
@@ -80,17 +80,22 @@
 	@echo "---------------------------------------------------------------------------------------"
 
 install-helper-functions:
+	install -d ${DESTDIR}/lib/udev
+	install -d ${DESTDIR}/etc/sysconfig
 	install -m 644 contrib/common/helper.functions ${DESTDIR}/lib/udev/helper.functions
 	install -m 644 contrib/common/udev_helper ${DESTDIR}/etc/sysconfig/udev_helper
 	
 install-network: install-helper-functions install-network-update
+	install -d ${DESTDIR}/etc/udev/rules.d/
 	@echo "Adding rules to ${DESTDIR}/etc/udev/rules.d/35-helper.rules."
 	@cp ${DESTDIR}/etc/udev/rules.d/35-helper.rules /tmp/first
 	@cat /tmp/first contrib/network/rules > ${DESTDIR}/etc/udev/rules.d/35-helper.rules 2>&1
-	@rm ${DESTDIR}/etc/rc.d/rc2.d/K80network
-	@rm ${DESTDIR}/etc/rc.d/rc{3,4,5}.d/S20network
+	@rm -f ${DESTDIR}/etc/rc.d/rc2.d/K80network
+	@rm -f ${DESTDIR}/etc/rc.d/rc{3,4,5}.d/S20network
 
 install-network-update:
+	install -d ${DESTDIR}/lib/udev
+	install -d ${DESTDIR}/etc/rc.d/init.d
 	install -m ${SCRIPTMODE} contrib/network/network_helper.sh ${DESTDIR}/lib/udev/network_helper.sh
 	install -m ${INITMODE} contrib/network/network ${DESTDIR}/etc/rc.d/init.d/network
 




More information about the cross-lfs mailing list