Merge

2004/04/19 14:02:59-05:00 ti.com!a0868066
Merges.

2004/04/19 14:00:46-05:00 ti.com!a0868066
Killing usage of {} expansion, which isnt supported by the ash shell.

BKrev: 408494e2t24Aqbe2prpXURtnZlhCmA

1 files changed, 14 insertions, 9 deletions

diff --git a/netbase/netbase_4.16.oe b/netbase/netbase_4.16.oe
index 35b17a7624..7086701064 100644
--- a/netbase/netbase_4.16.oe
+++ b/netbase/netbase_4.16.oe
@@ -5,27 +5,32 @@ infrastructure for basic TCP/IP based networking."
 SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz"
 
 do_install () {
-	install -d ${D}/etc/init.d ${D}/${sbindir} ${D}/${mandir}/man8
-	install -d ${D}/etc/network/{if-pre-up.d,if-up.d}
-	install -m 0644 ${FILESDIR}/options ${D}/etc/network/options
-	install -m 0755 ${FILESDIR}/init ${D}/etc/init.d/networking
-	install -m 0644 etc-rpc ${D}/etc/rpc
-	install -m 0644 etc-protocols ${D}/etc/protocols
-	install -m 0644 etc-services ${D}/etc/services
+	install -d ${D}/${sysconfdir}/init.d \
+		   ${D}/${sbindir} \
+		   ${D}/${mandir}/man8 \
+		   ${D}/${sysconfdir}/network/if-pre-up.d \
+		   ${D}/${sysconfdir}/network/if-up.d \
+		   ${D}/${sysconfdir}/network/if-down.d \
+		   ${D}/${sysconfdir}/network/if-post-down.d
+	install -m 0644 ${FILESDIR}/options ${D}/${sysconfdir}/network/options
+	install -m 0755 ${FILESDIR}/init ${D}/${sysconfdir}/init.d/networking
+	install -m 0644 etc-rpc ${D}/${sysconfdir}/rpc
+	install -m 0644 etc-protocols ${D}/${sysconfdir}/protocols
+	install -m 0644 etc-services ${D}/${sysconfdir}/services
 	install -m 0755 update-inetd ${D}/${sbindir}/
 	install -m 0644 update-inetd.8 ${D}/${mandir}/man8/
 }
 
 pkg_postinst () {
 	if test -n "${D}"; then
-		D="-r $D"
+		D="-r ${D}"
 	fi
 	update-rc.d $D networking start 40 S . stop 40 0 6 1 .
 }
 
 pkg_prerm () {
 	if test -n "${D}"; then
-		D="-r $D"
+		D="-r ${D}"
 	fi
 	update-rc.d $D networking remove
 }