Merge branch 'busybox' into merge

Conflicts:
	debianutils/which.c
	editors/vi.c
	libbb/executable.c

1 files changed, 3 insertions, 1 deletions

diff --git a/scripts/trylink b/scripts/trylink
index e47169917..5da494fbb 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -268,7 +268,7 @@ fi
 
 if test "$CONFIG_FEATURE_INDIVIDUAL" = y; then
     echo "Linking individual applets against libbusybox (see $sharedlib_dir/*)"
-    gcc -DNAME_MAIN_CNAME -E -include include/autoconf.h include/applets.h \
+    gcc -DNAME_MAIN -E -include include/autoconf.h include/applets.h \
     | grep -v "^#" \
     | grep -v "^$" \
     > applet_lst.tmp
@@ -300,6 +300,8 @@ int main(int argc, char **argv)
         }
         rm -- "$sharedlib_dir/applet.c" $EXE.out
         $STRIP -s --remove-section=.note --remove-section=.comment $EXE
+        # Let user see that we do something - list the names of created binaries:
+        echo "$EXE"
 
     done <applet_lst.tmp
 fi