From e4ab707adec8bbe45956104d8b68ed223f6487ae Mon Sep 17 00:00:00 2001 From: assar Date: Wed, 25 Jul 2001 16:47:50 +0000 Subject: [PATCH] update build infrastructure for texinfo 4.0 --- gnu/usr.bin/texinfo/Makefile | 8 ++++- gnu/usr.bin/texinfo/common/Makefile | 4 +-- gnu/usr.bin/texinfo/common/config.h | 46 ++++++++++++++++++++------- gnu/usr.bin/texinfo/makeinfo/Makefile | 8 +++-- 4 files changed, 50 insertions(+), 16 deletions(-) diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile index ef54af2be30a..70d4e4007513 100644 --- a/gnu/usr.bin/texinfo/Makefile +++ b/gnu/usr.bin/texinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/01/09 03:13:41 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2001/07/25 16:47:50 assar Exp $ .include @@ -17,11 +17,17 @@ FILESNAME_${F}= texinfo.mo .endfor .endif +MAN= info.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \ + info.5 texinfo.5 + TEXINFO= info-stnd.texi info.texi texinfo.txi DIST= ${.CURDIR}/../../dist +INFOFLAGS= -I${DIST}/texinfo/doc + .PATH: ${DIST}/texinfo ${DIST}/texinfo/doc ${DIST}/texinfo/po +.include .include .include .include diff --git a/gnu/usr.bin/texinfo/common/Makefile b/gnu/usr.bin/texinfo/common/Makefile index d3d2e71f0805..bc3f667e0d82 100644 --- a/gnu/usr.bin/texinfo/common/Makefile +++ b/gnu/usr.bin/texinfo/common/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2000/11/01 02:06:25 itojun Exp $ +# $NetBSD: Makefile,v 1.5 2001/07/25 16:47:50 assar Exp $ LIB= common -SRCS+= getopt.c getopt1.c xmalloc.c xstrdup.c +SRCS+= getopt.c getopt1.c substring.c xexit.c xmalloc.c xstrdup.c CPPFLAGS+= -DGNULOCALEDIR=\"/usr/share/locale\" \ -DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\" diff --git a/gnu/usr.bin/texinfo/common/config.h b/gnu/usr.bin/texinfo/common/config.h index 866a24cb28dd..e2e4c7ce6256 100644 --- a/gnu/usr.bin/texinfo/common/config.h +++ b/gnu/usr.bin/texinfo/common/config.h @@ -39,6 +39,9 @@ /* Define if you have a working `mmap' system call. */ #define HAVE_MMAP 1 +/* Define if you have the strcoll function and it is properly defined. */ +#define HAVE_STRCOLL 1 + /* Define if you have the vprintf function. */ #define HAVE_VPRINTF 1 @@ -78,6 +81,9 @@ */ /* #undef STACK_DIRECTION */ +/* Define if the `S_IS*' macros in do not work properly. */ +/* #undef STAT_MACROS_BROKEN */ + /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -99,12 +105,6 @@ /* Define as 1 if you have the stpcpy function. */ /* #undef HAVE_STPCPY */ -/* Define to the name of the distribution. */ -#define PACKAGE "texinfo" - -/* Define to the version of the distribution. */ -#define VERSION "3.12" - /* Define if you have the __argz_count function. */ /* #undef HAVE___ARGZ_COUNT */ @@ -171,6 +171,9 @@ /* Define if you have the strerror function. */ #define HAVE_STRERROR 1 +/* Define if you have the strncasecmp function. */ +#define HAVE_STRNCASECMP 1 + /* Define if you have the header file. */ /* #undef HAVE_ARGZ_H */ @@ -186,6 +189,9 @@ /* Define if you have the header file. */ #define HAVE_MALLOC_H 1 +/* Define if you have the header file. */ +#define HAVE_MEMORY_H 1 + /* Define if you have the header file. */ /* #undef HAVE_NCURSES_TERMCAP_H */ @@ -195,6 +201,9 @@ /* Define if you have the header file. */ #define HAVE_PWD_H 1 +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + /* Define if you have the header file. */ #define HAVE_STRING_H 1 @@ -234,17 +243,32 @@ /* Define if you have the header file. */ #define HAVE_UNISTD_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_VALUES_H */ - /* Define if you have the bsd library (-lbsd). */ /* #undef HAVE_LIBBSD */ /* Define if you have the i library (-li). */ /* #undef HAVE_LIBI */ -/* Define if you have the z library (-lz). */ -#define HAVE_LIBZ 1 +/* Name of package */ +#define PACKAGE "texinfo" + +/* Version number of package */ +#define VERSION "4.0" + +/* Define if TIOCGWINSZ requires sys/ioctl.h */ +/* #undef GWINSZ_IN_SYS_IOCTL */ + +/* Define if this function is declared. */ +#define HAVE_DECL_STRERROR 1 + +/* Define if this function is declared. */ +#define HAVE_DECL_STRCASECMP 1 + +/* Define if this function is declared. */ +#define HAVE_DECL_STRNCASECMP 1 + +/* Define if this function is declared. */ +#define HAVE_DECL_STRCOLL 1 /* For gettext (NLS) */ #ifdef ENABLE_NLS diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile index 4548eb9924ce..3378881073bc 100644 --- a/gnu/usr.bin/texinfo/makeinfo/Makefile +++ b/gnu/usr.bin/texinfo/makeinfo/Makefile @@ -1,7 +1,11 @@ -# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:29 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2001/07/25 16:47:50 assar Exp $ PROG= makeinfo -SRCS= makeinfo.c multi.c +SRCS= cmds.c defun.c files.c footnote.c \ + html.c index.c insertion.c lang.c \ + macro.c makeinfo.c multi.c node.c \ + sectioning.c toc.c + CPPFLAGS+= -I${DIST}/texinfo/makeinfo MKMAN= no