eliminate the need for gettext() when building the host-only tool.

gnu/dist/texinfo/lib/system.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: system.h,v 1.8 2008/09/02 08:00:24 christos Exp $	*/
+/*	$NetBSD: system.h,v 1.9 2008/09/03 09:55:23 dogcow Exp $	*/
 
 /* system.h: system-dependent declarations; include this first.
    Id: system.h,v 1.12 2004/04/26 13:56:57 karl Exp
@@ -56,7 +56,11 @@ extern char *substring (const char *, const char *);
 #include "gettext.h"
 #undef const
 
+#ifndef HOSTTOOL
 #define _(String) gettext (String)
+#else
+#define _(String) (String)
+#endif
 #define N_(String) (String)
 
 #ifdef STDC_HEADERS
@@ -269,10 +273,12 @@ extern int strcoll ();
 /* Some systems don't declare this function in pwd.h. */
 struct passwd *getpwnam (const char *name);
 
+#ifndef HOSTTOOL
 /* Our library routines not included in any system library.  */
 extern void *xmalloc (size_t), *xrealloc (void *, size_t);
 extern char *xstrdup (const char *);
 extern void xexit (int);
+#endif
 
 /* For convenience.  */
 #define STREQ(s1,s2) (strcmp (s1, s2) == 0)

gnu/usr.bin/texinfo/makedoc/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/09/02 14:46:53 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2008/09/03 09:55:23 dogcow Exp $
 
 NOMAN=
 MAKEDOC=
@@ -10,9 +10,6 @@ HOSTPROG=	makedoc
 .PATH: ${IDIST}/info
 HOST_CPPFLAGS+= -I${IDIST}/info -I${IDIST}/lib -I${.CURDIR}/../common
 HOST_CPPFLAGS+= -Dxstrdup=strdup -Dxmalloc=malloc -Dxfree=free
-HOST_CPPFLAGS+= -Dxexit=exit -Dxrealloc=realloc
-
-LDADD+=-lintl
-DPADD+=${LIBINTL}
+HOST_CPPFLAGS+= -Dxexit=exit -Dxrealloc=realloc -DHOSTTOOL
 
 .include <bsd.hostprog.mk>