--- Makefile.orig	Thu Oct 12 15:04:06 1995
+++ Makefile	Tue Jan  4 00:43:59 2000
@@ -240,31 +240,14 @@
 	  set $(SHELLDEBUG); \
 	  if [ -d $$TEXINFODIR -a -r ispell.info ]; then \
 	    set -ex; \
-	    rm -f $$TEXINFODIR/ispell; \
-	    $$INSTALL ispell.info $$TEXINFODIR/ispell; \
-	    chmod 644 $$TEXINFODIR/ispell; \
+	    rm -f $$TEXINFODIR/ispell.info; \
+	    $$INSTALL ispell.info $$TEXINFODIR; \
+	    chmod 644 $$TEXINFODIR/ispell.info; \
 	  else \
 	    : ; \
 	  fi
 	@set +e; \
-	  . ./config.sh; \
-	  set $(SHELLDEBUG); \
-	  if [ -d $$ELISPDIR ]; then \
-	    set -ex; \
-	    rm -f $$ELISPDIR/ispell.el; \
-	    $$INSTALL ispell.el $$ELISPDIR; \
-	    if sh iwhich $$EMACS >/dev/null; then \
-		echo '(byte-compile-file "'"$$ELISPDIR/ispell.el"'")' \
-		  > /tmp/emi$$$$; \
-		$$EMACS -batch -l /tmp/emi$$$$; \
-		rm -f /tmp/emi$$$$; \
-		chmod 644 $$ELISPDIR/ispell.el $$ELISPDIR/ispell.elc; \
-	    else \
-		chmod 644 $$ELISPDIR/ispell.el; \
-	    fi; \
-	  else \
-	    : ; \
-	  fi
+	  . ./config.sh
 
 install-dictbuild:
 	@. ./config.sh; \
@@ -324,7 +307,7 @@
 	  set $(SHELLDEBUG); \
 	  if [ -d $$TEXINFODIR ]; then \
 	    if sh iwhich makeinfo >/dev/null \
-	      &&  makeinfo ispell.texinfo 2>/dev/null; then \
+	      && makeinfo --no-split ispell.texinfo 2>/dev/null; then \
 		:; \
 	    elif sh iwhich $$EMACS >/dev/null; then \
 		set -e; \
@@ -508,7 +491,7 @@
 local.h:
 	set +e; [ -r local.h ]  ||  cp local.h.samp local.h
 
-msgs.h:	config.sh FRC
+msgs.h:	config.sh
 	@. ./config.sh; \
 	  set $(SHELLDEBUG); \
 	  set +e; \
@@ -522,7 +505,8 @@
 	  else \
 	    set -x; \
 	    rm -f msgs.h; ln $$msgs msgs.h  ||  cp $$msgs msgs.h; \
-	  fi
+	  fi; \
+	touch msgs.h
 
 FRC: