$NetBSD: patch-ab,v 1.5 2009/02/12 16:06:32 joerg Exp $

--- Makefile.orig	2005-05-25 15:57:02.000000000 +0200
+++ Makefile
@@ -373,13 +373,10 @@ install-dictbuild:
 	    rm -f fixispell-a$$MAN1EXT
 	@. ./config.sh; \
 	  set -x; \
-	  $$INSTALL sq.1 $$MAN1DIR/sq$$MAN1EXT; \
 	  for m in buildhash munchlist findaffix tryaffix; do \
 	    echo ".so `basename $$MAN1DIR`/ispell$$MAN1EXT" \
 	      > $$MAN1DIR/$$m$$MAN1EXT; \
-	  done; \
-	  echo ".so `basename $$MAN1DIR`/sq$$MAN1EXT" \
-	    > $$MAN1DIR/unsq$$MAN1EXT 
+	  done
 	@. ./config.sh; \
 	  set -x; \
 	  cd $$MAN1DIR; \
@@ -506,10 +503,10 @@ defhash.h:  config.X local.h Makefile
 
 config.sh:  config.X defhash.h local.h Makefile
 	set $(SHELLDEBUG); \
-	for var in BAKEXT BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
+	for var in BAKEXT CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
 	  DEFLANG EXEEXT HASHSUFFIX INSTALL \
-	  LANGUAGES LIBDIR LIBES LINK LINT LINTFLAGS LOOK_XREF \
-	  MAKE_SORTTMP MAN1DIR MAN1EXT MAN45DIR MAN45EXT MAN45SECT MASTERHASH \
+	  LANGUAGES LIBES LINK LINT LINTFLAGS LOOK_XREF \
+	  MAKE_SORTTMP MAN1EXT MAN45EXT MAN45SECT MASTERHASH \
 	  MSGLANG POUNDBANG REGLIB STATSUFFIX \
 	  SPELL_XREF TERMLIB TIB_XREF WORDS YACC \
 	  ; do \
@@ -518,6 +515,12 @@ config.sh:  config.X defhash.h local.h M
 	      | sed -e 's/"[^"]*$$/'"'/" -e "s/=/='/" -e 's/\\"/"/g' \
 	      | sed -n -e '$$p'; \
 	  done > config.sh; \
+	for var in BINDIR LIBDIR MAN1DIR MAN45DIR; do \
+	    cat config.X defhash.h local.h \
+	      | sed -n -e "s/^#define[ 	]*$$var[ 	]*"'"'"/$$var=/p" \
+	      | sed -e 's/"[^"]*$$/'"'/" -e "s/=/=\$${DESTDIR}'/" -e 's/\\"/"/g' \
+	      | sed -n -e '$$p'; \
+	  done >> config.sh; \
 	echo 'case "$$MAKE_SORTTMP" in "") \
 	  SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
 	  >> config.sh
@@ -636,7 +639,7 @@ local.h:
 	set +e; \
 	  [ -r local.h ]  ||  (cp local.h.generic local.h; chmod u+w local.h)
 
-msgs.h:	config.sh FRC
+msgs.h:	config.sh
 	@. ./config.sh; \
 	  set $(SHELLDEBUG); \
 	  set +e; \
@@ -650,7 +653,8 @@ msgs.h:	config.sh FRC
 	  else \
 	    set -x; \
 	    rm -f msgs.h; $$LINK $$msgs msgs.h  ||  cp $$msgs msgs.h; \
-	  fi
+	  fi; \
+	touch msgs.h
 
 FRC: