rename nm and strip to acknm and ackstrip

this is to force invocations of these utils for ack to be
explicitly named such, so in the future binutils can be installed
in /usr/pkg without the g- prefix.

diff --git a/commands/Makefile b/commands/Makefile
index f8dcf6614c65fd2f355afb195bcd068d6aafde97..b0c66f9ed65e104ff7d70a98b0f6e7824476c2ca 100644 (file)
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -18,14 +18,14 @@ SUBDIR=     aal add_route adduser advent arp ash at autil awk \
        less lex life loadkeys loadramdisk logger login look lp \
        lpd ls lspci M m4 mail make  MAKEDEV man \
        mdb mdocml mesg mined mkdep mkdir mkdist mkfifo mkfs mknod \
-       mkproto modem mount mt netconf newroot nice nm nohup \
+       mkproto modem mount mt netconf newroot nice acknm nohup \
        nonamed od packit packman passwd paste patch pax \
        ping postinstall poweroff pr prep printf printroot \
        profile progressbar proto pr_routes ps pwd pwdauth \
        ramdisk rarpd rawspeed rcp rdate readall readclock \
        readfs reboot remsync rev rget rlogin rlogind rmdir \
        rotate rsh rshd sed service setup shar size \
-       sleep slip sort spell split srccrc stat strings strip \
+       sleep slip sort spell split srccrc stat strings ackstrip \
        stty su sum svclog swapfs swifi sync synctree sysenv \
        syslogd tail talk talkd tar tcpd tcpdp tcpstat tee telnet \
        telnetd term termcap tget time tinyhalt top touch tr \

diff --git a/commands/nm/Makefile b/commands/acknm/Makefile
similarity index 70%
rename from commands/nm/Makefile
rename to commands/acknm/Makefile
index 0ecdc98a57cf7807cc3054dae9a3ca541f11f86e..45bc16fbc69be92cf0a894b548ece8f6f615dd18 100644 (file)
--- a/commands/nm/Makefile
+++ b/commands/acknm/Makefile
@@ -1,4 +1,4 @@
-PROG=  nm
+PROG=  acknm
 MAN=
 
 .include <bsd.prog.mk>

diff --git a/commands/nm/nm.c b/commands/acknm/acknm.c
similarity index 100%
rename from commands/nm/nm.c
rename to commands/acknm/acknm.c

diff --git a/commands/strip/Makefile b/commands/ackstrip/Makefile
similarity index 65%
rename from commands/strip/Makefile
rename to commands/ackstrip/Makefile
index 1e28f4cd23f861921825da4c6ff7899e22ad43d6..beb0cb0a8961c75a3c930a0e24b146440bbb7db1 100644 (file)
--- a/commands/strip/Makefile
+++ b/commands/ackstrip/Makefile
@@ -1,4 +1,4 @@
-PROG=  strip
+PROG=  ackstrip
 MAN=
 
 .include <bsd.prog.mk>

diff --git a/commands/strip/strip.c b/commands/ackstrip/ackstrip.c
similarity index 100%
rename from commands/strip/strip.c
rename to commands/ackstrip/ackstrip.c

diff --git a/commands/datasizes/datasizes.sh b/commands/datasizes/datasizes.sh
index fa97833c58bfbc2273c5c90b754442150b249da8..2c45a672d21094fd72a835c1e2bc3e97e09875c0 100644 (file)
--- a/commands/datasizes/datasizes.sh
+++ b/commands/datasizes/datasizes.sh
@@ -8,7 +8,7 @@ fi
 if file $1 | grep NSYM >/dev/null 2>&1; then
   NM="gnm --radix=d"
 else
-  NM="nm -d"
+  NM="acknm -d"
 fi
 
 $NM -n $1 | grep ' [bBdD] [^.]' | awk '{ if (lastpos) printf "%10ld kB  %s\n", ($1-lastpos)/1024, lastname; lastpos=$1; lastname=$3 }' | sort -n

diff --git a/commands/profile/sprofalyze.pl b/commands/profile/sprofalyze.pl
index 87591e10ad52d229457bc5fd7c970a9be92267ee..3e6cca63d4e46480384f58077a332be157698d1c 100755 (executable)
--- a/commands/profile/sprofalyze.pl
+++ b/commands/profile/sprofalyze.pl
@@ -12,7 +12,7 @@
 # Configuration options:
 
 # Location and parameters of nm program to extract symbol tables
-$nm = "/usr/bin/nm -dn";
+$nm = "/usr/bin/acknm -dn";
 
 # Location of src (including trailing /)
        $src_root = qw(

diff --git a/commands/unstack/unstack.sh b/commands/unstack/unstack.sh
index cc6eb49dfebf044e4c610709c20db5807d21166d..648f7609267eb14ac8b3bb1a0b435e46688076a4 100644 (file)
--- a/commands/unstack/unstack.sh
+++ b/commands/unstack/unstack.sh
@@ -5,12 +5,12 @@ then  echo "Usage: $0 <executable> [0x... [0x... ] ]"
        exit 1
 fi
 
-PATH=$PATH:/usr/gnu/bin
+PATH=$PATH:/usr/gnu/bin:/usr/pkg/bin
 
 if file $1 | grep NSYM >/dev/null 2>&1; then
   NM="gnm --radix=d"
 else
-  NM="nm -d"
+  NM="acknm -d"
 fi
 
 executable=$1