--- eval.c.orig	Tue Jul 13 09:48:39 1999
+++ eval.c	Thu Sep 21 22:38:22 2006
@@ -773,6 +773,7 @@
 		}
 		if (e->loc->argc == 0) {
 			xp->str = null;
+			xp->var = global(sp);
 			state = c == '@' ? XNULLSUB : XSUB;
 		} else {
 			xp->u.strv = (const char **) e->loc->argv + 1;
--- siglist.sh.orig	Wed Sep 18 09:52:41 1996
+++ siglist.sh	Thu Sep 21 22:38:22 2006
@@ -23,7 +23,7 @@
 	{ QwErTy SIG\1 , "\1", "\2" },\
 #endif/') > $in
 $CPP $in  > $out
-sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort +2n +0n |
+sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort -n -k 3,3 -k 1,1 |
     sed 's/^[0-9]* //' |
     awk 'BEGIN { last=0; nsigs=0; }
 	{
--- Makefile.in.orig	Thu Sep 21 22:40:39 2006
+++ Makefile.in	Thu Sep 21 22:44:48 2006
@@ -27,13 +27,13 @@
 transform=@program_transform_name@
 
 bindir = $(exec_prefix)/bin
-mandir = $(prefix)/man/man$(manext)
+mandir = $(prefix)/share/man/man$(manext)
 manext = 1
 
 # Suffix for executables: nothing for unix, .exe for os/2.
 exe_suffix=@ac_exe_suffix@
 
-SHELL = /bin/sh
+#SHELL = /bin/sh
 
 SRCS = alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c \
 	eval.c exec.c expr.c history.c io.c jobs.c lex.c mail.c \
@@ -80,8 +80,8 @@
 	$(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $<
 
 install: installdirs all
-	$(INSTALL_PROGRAM) $(SHELL_PROG)$(exe_suffix) $(bindir)/`echo $(SHELL_PROG)|sed '$(transform)'`$(exe_suffix)
-	-$(INSTALL_DATA) $(SHELL_PROG).1 $(mandir)/`echo $(SHELL_PROG)|sed '$(transform)'`.$(manext)
+	$(INSTALL_PROGRAM) $(SHELL_PROG)$(exe_suffix) $(DESTDIR)$(bindir)/`echo $(SHELL_PROG)|sed '$(transform)'`$(exe_suffix)
+	-$(INSTALL_DATA) $(SHELL_PROG).1 $(DESTDIR)$(mandir)/`echo $(SHELL_PROG)|sed '$(transform)'`.$(manext)
 	-@prog=$(bindir)/`echo $(SHELL_PROG)|sed '$(transform)'`$(exe_suffix);\
 	    test -f /etc/shells \
 	    && (grep "^$$prog\$$" /etc/shells > /dev/null \
@@ -90,7 +90,7 @@
       you should add it if you want to set your shell to $(SHELL_PROG)")
 
 installdirs:
-	$(srcdir)/mkinstalldirs $(bindir) $(mandir)
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
 
 uninstall:
 	rm -f $(bindir)/`echo $(SHELL_PROG)|sed '$(transform)'`$(exe_suffix)