addjust for texinfo 4.8

This commit is contained in:
christos 2008-09-02 08:38:35 +00:00
parent 834f5c54aa
commit 29a97b91d6
6 changed files with 51 additions and 18 deletions

View File

@ -1,8 +1,9 @@
# $NetBSD: Makefile,v 1.20 2004/07/18 16:34:45 tron Exp $
# $NetBSD: Makefile,v 1.21 2008/09/02 08:38:35 christos Exp $
.include <bsd.own.mk>
SUBDIR= common .WAIT info infokey install-info makeinfo texi2dvi texindex
SUBDIR= makedoc .WAIT common .WAIT info infokey install-info makeinfo \
texi2dvi texindex
.if ${MKSHARE} != "no"
FILESDIR= /usr/share/misc

View File

@ -1,12 +1,14 @@
# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:30 lukem Exp $
# $NetBSD: Makefile,v 1.12 2008/09/02 08:38:35 christos Exp $
.include "../Makefile.inc"
LIBISPRIVATE= yes
LIB= common
SRCS+= substring.c xexit.c xmalloc.c xstrdup.c
SRCS+= substring.c xexit.c xmalloc.c xstrdup.c key.c doc.c
CPPFLAGS+= -DGNULOCALEDIR=\"/usr/share/locale\" \
-DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\"
-DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\" \
-I${IDIST}/info
.include <bsd.lib.mk>
@ -16,3 +18,17 @@ all: ${FILES}
.SUFFIXES: .gmo .mo
.gmo.mo:
@cp $< $@
GEN_SRCS = funs.h key.c doc.c
CLEANFILES+= ${GEN_SRCS}
CMD_SRCS = session.c echo-area.c infodoc.c m-x.c indices.c nodemenu.c \
footnotes.c variables.c
MAKEDOCDIR!=cd ${.CURDIR}/../makedoc && ${PRINTOBJDIR}
MAKEDOC=${MAKEDOCDIR}/makedoc
${GEN_SRCS}: ${MAKEDOC} ${CMD_SRCS}
${.ALLSRC}
.PATH: ${IDIST}/info ${IDIST}/doc

View File

@ -1,4 +1,3 @@
/* $NetBSD: config.h,v 1.10 2004/07/12 23:46:40 wiz Exp $ */
/* config.h. Generated by configure. */
/* config.in. Generated from configure.ac by autoheader. */
@ -35,7 +34,7 @@
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#define HAVE_DCGETTEXT 1
/* #undef HAVE_DCGETTEXT */
/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
don't. */
@ -80,7 +79,7 @@
#define HAVE_FCNTL_H 1
/* Define to 1 if you have the `fwprintf' function. */
/* #undef HAVE_FWPRINTF */
#define HAVE_FWPRINTF 1
/* Define to 1 if you have the `getcwd' function. */
#define HAVE_GETCWD 1
@ -98,7 +97,7 @@
#define HAVE_GETPAGESIZE 1
/* Define if the GNU gettext() function is already present or preinstalled. */
#define HAVE_GETTEXT 1
/* #undef HAVE_GETTEXT */
/* Define to 1 if you have the `gettimeofday' function. */
/* #undef HAVE_GETTIMEOFDAY */
@ -177,7 +176,7 @@
#define HAVE_NL_TYPES_H 1
/* Define if your printf() function supports format strings with positions. */
/* #undef HAVE_POSIX_PRINTF */
#define HAVE_POSIX_PRINTF 1
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
@ -344,13 +343,13 @@
#define PACKAGE_NAME "GNU Texinfo"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "GNU Texinfo 4.7"
#define PACKAGE_STRING "GNU Texinfo 4.8"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "texinfo"
/* Define to the version of this package. */
#define PACKAGE_VERSION "4.7"
#define PACKAGE_VERSION "4.8"
/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
/* #undef PRI_MACROS_BROKEN */
@ -380,7 +379,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
#define VERSION "4.7"
#define VERSION "4.8"
/* Define to 1 if on MINIX. */
/* #undef _MINIX */

View File

@ -1,11 +1,16 @@
# $NetBSD: Makefile,v 1.4 2003/01/17 15:32:24 wiz Exp $
# $NetBSD: Makefile,v 1.5 2008/09/02 08:38:35 christos Exp $
.include <bsd.own.mk>
PROG= info
SRCS= dir.c display.c doc.c dribble.c echo-area.c filesys.c \
SRCS= dir.c display.c dribble.c echo-area.c filesys.c \
footnotes.c gc.c indices.c info-utils.c info.c infodoc.c \
infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
signals.c terminal.c tilde.c variables.c window.c
CPPFLAGS+= -I${IDIST}/info \
COMMONDIR!=cd ${.CURDIR}/../common && ${PRINTOBJDIR}
CPPFLAGS+= -I${IDIST}/info -I${COMMONDIR} \
-DDEFAULT_INFOPATH=\"/usr/pkg/info:/usr/X11R6/info:/usr/X11/info:/usr/local/info:/usr/share/info:/usr/info\"
LDADD+= -ltermcap
DPADD+= ${LIBTERMCAP}

View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.2 2004/07/12 23:45:26 wiz Exp $
# $NetBSD: Makefile,v 1.3 2008/09/02 08:38:36 christos Exp $
PROG= infokey
SRCS= infokey.c key.c
SRCS= infokey.c
CPPFLAGS+= -I${IDIST}/info

View File

@ -0,0 +1,12 @@
# $NetBSD: Makefile,v 1.1 2008/09/02 08:38:36 christos Exp $
NOMAN=
.include "../Makefile.inc"
HOSTPROG= makedoc
.PATH: ${IDIST}/info
HOST_CPPFLAGS+= -I${IDIST}/info -I${IDIST}/lib -I${.CURDIR}/../common
.include <bsd.hostprog.mk>