X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Fbase%2Futil-linux%2Futil-linux;fp=packages%2Fbase%2Futil-linux%2Futil-linux;h=098c56e5658d923215cacb40e11dad2477cf747f;hp=0eac9de6519b5ef842aa2d33b569761aa66fcdd7;hb=793f79d0d200544e7193cdfd4b66dc2479bf7247;hpb=504579d0d381b02fc33fe1c696d64f96135a15a8

diff --git a/packages/base/util-linux/util-linux b/packages/base/util-linux/util-linux
index 0eac9de..098c56e 100644
--- a/packages/base/util-linux/util-linux
+++ b/packages/base/util-linux/util-linux
@@ -2,14 +2,14 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.12q
-# [S] 1-8 2-15
-# [D] util-linux-2.12q.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/util-linux/
+# [V] 2.12r
+# [S] 1-2 2-15
+# [D] util-linux-2.12r.tar.bz2 ftp://ftp.kernel.org/pub/linux/utils/util-linux/
 
-if [ "$hdw_status" = "1" ]; then
+if [ "$stage" = "1" ]; then
 	pre_install()	{
-		cp configure configure.orig
-		sed "s%/usr/include%$prefix/include%g" configure.orig configure
+		sed "s%/usr/include%$prefix/include%g" configure > tmp~
+		mv tmp~ configure
 		chmod 755 configure
 			}
 	build_main()	{
@@ -19,11 +19,11 @@ if [ "$hdw_status" = "1" ]; then
 		make -C text-utils more
 			}
 	post_install() 	{
-		cp mount/{mount,umount} text-utils/more $prefix/bin
+		cp -v mount/{mount,umount} text-utils/more $prefix/bin
 			}
 fi
 
-if [ "$hdw_status" = "2" ]; then
+if [ "$stage" = "2" ]; then
 	pre_install()	{
 		sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
    			hwclock/hwclock.c > tmp~ &&