diff options
author | Mark Murray <markm@FreeBSD.org> | 1999-01-14 20:00:46 +0000 |
---|---|---|
committer | Mark Murray <markm@FreeBSD.org> | 1999-01-14 20:00:46 +0000 |
commit | 8bb599c434312a72c2cc0fd2115f40d750dc0127 (patch) | |
tree | 6a20513ce88f73a2173a43169b7b4f34cc5475f4 /gnu | |
parent | 1631f00d8310f9e3ae19e4bb3186342af49a1418 (diff) | |
download | src-8bb599c434312a72c2cc0fd2115f40d750dc0127.tar.gz src-8bb599c434312a72c2cc0fd2115f40d750dc0127.zip |
Update this area for Texinfo-3.12.
Submitted by: lkoeller@cc.fh-lippe.de
Notes
Notes:
svn path=/head/; revision=42665
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/texinfo/Makefile | 2 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/Makefile.inc | 2 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/doc/Makefile | 11 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/info/Makefile | 26 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/install-info/Makefile | 13 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/libintl/Makefile | 24 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/libtxi/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/texinfo/makeinfo/Makefile | 12 |
8 files changed, 62 insertions, 32 deletions
diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile index f1539d5a2903..bd696f27ef04 100644 --- a/gnu/usr.bin/texinfo/Makefile +++ b/gnu/usr.bin/texinfo/Makefile @@ -2,6 +2,6 @@ # $Id$ # -SUBDIR= libtxi makeinfo info install-info doc +SUBDIR= libtxi libintl makeinfo info install-info doc .include <bsd.subdir.mk> diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc index 5ee8874939a6..80ba03860de2 100644 --- a/gnu/usr.bin/texinfo/Makefile.inc +++ b/gnu/usr.bin/texinfo/Makefile.inc @@ -4,8 +4,10 @@ TXIDIR= ${.CURDIR}/../../../../contrib/texinfo .if exists(${.OBJDIR}/../libtxi) LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a +LIBINTL = ${.OBJDIR}/../libintl/libintl.a .else LIBTXI= ${.CURDIR}/../libtxi/libtxi.a +LIBINTL = ${.CURDIR}/../libintl/libintl.a .endif .include "../../Makefile.inc" diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile index 3416ad3bcb64..6b00ea04fc9a 100644 --- a/gnu/usr.bin/texinfo/doc/Makefile +++ b/gnu/usr.bin/texinfo/doc/Makefile @@ -1,7 +1,14 @@ # $Id$ -INFO= texinfo info info-stnd makeinfo +INFO= info-stnd info texinfo + +MAKEINFO= ../makeinfo/makeinfo + +CLEANFILES+= ${.OBJDIR}/texinfo.texi + +texinfo.texi: texinfo.txi + @ln -sf ${.OODATE} ${.TARGET} .include <bsd.info.mk> -.PATH: ${TXIDIR} ${TXIDIR}/info ${TXIDIR}/makeinfo +.PATH: ${TXIDIR}/doc diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile index 2ba6f067c55e..2e291d6a2c7f 100644 --- a/gnu/usr.bin/texinfo/info/Makefile +++ b/gnu/usr.bin/texinfo/info/Makefile @@ -1,21 +1,23 @@ # $Id$ PROG= info +NOMAN= yes -SRCS= dir.c display.c doc.c echo_area.c filesys.c info-utils.c info.c infodoc.c infomap.c -SRCS+= m-x.c nodes.c search.c session.c signals.c terminal.c tilde.c window.c indices.c -SRCS+= xmalloc.c nodemenu.c footnotes.c dribble.c variables.c gc.c man.c clib.c +SRCS= dir.c display.c display.h doc.c doc.h dribble.c dribble.h +SRCS+= echo-area.c echo-area.h filesys.c filesys.h footnotes.c +SRCS+= footnotes.h funs.h gc.c gc.h indices.c indices.h +SRCS+= info-utils.c info-utils.h info.c info.h infodoc.c +SRCS+= infomap.c infomap.h m-x.c man.c man.h nodemenu.c nodes.c +SRCS+= nodes.h search.c search.h session.c session.h signals.c +SRCS+= signals.h termdep.h terminal.c terminal.h tilde.c tilde.h +SRCS+= variables.c variables.h window.c window.h -CFLAGS+= -DHANDLE_MAN_PAGES -DNAMED_FUNCTIONS=1 -CFLAGS+= -DDEFAULT_INFOPATH=\"${INFODIR}:/usr/local/info:.\" -CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 -CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -CFLAGS+= -DHAVE_ALLOCA=1 -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 -CFLAGS+= -DHAVE_STRCHR=1 -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 -CFLAGS+= -DHAVE_SIGPROCMASK=1 -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi +CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\" +CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H +CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I../libintl -DPADD= ${LIBTERMCAP} ${LIBTXI} -LDADD= -ltermcap ${LIBTXI} +DPADD= ${LIBTERMCAP} ${LIBTXI} ${LIBINTL} +LDADD= -ltermcap ${LIBTXI} ${LIBINTL} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile index e233f5db190f..114baaab228f 100644 --- a/gnu/usr.bin/texinfo/install-info/Makefile +++ b/gnu/usr.bin/texinfo/install-info/Makefile @@ -1,15 +1,12 @@ -# $Id: Makefile,v 1.6 1997/04/07 16:52:45 bde Exp $ +# $Id$ PROG= install-info -CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 -CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_ALLOCA=1 -CFLAGS+= -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 -DHAVE_STRCHR=1 -CFLAGS+= -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 -DHAVE_SIGPROCMASK=1 -CFLAGS+= -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi +CFLAGS+= -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" +CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I../libintl -DPADD= ${LIBTXI} -LDADD= ${LIBTXI} +DPADD= ${LIBTXI} ${LIBINTL} -lz +LDADD= ${LIBTXI} ${LIBINTL} -lz .include <bsd.prog.mk> diff --git a/gnu/usr.bin/texinfo/libintl/Makefile b/gnu/usr.bin/texinfo/libintl/Makefile new file mode 100644 index 000000000000..0bce892fccdd --- /dev/null +++ b/gnu/usr.bin/texinfo/libintl/Makefile @@ -0,0 +1,24 @@ +# $Id$ + +LIB= intl +INTERNALLIB= true +INTERNALSTATICLIB= true + +CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" +CFLAGS+= -DGNULOCALEDIR=\"/usr/share/locale\" +CFLAGS+= -DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\" +CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I${TXIDIR}/intl -I. + +SRCS= bindtextdom.c dcgettext.c dgettext.c gettext.c +SRCS+= finddomain.c loadmsgcat.c localealias.c textdomain.c +SRCS+= l10nflist.c explodename.c intl-compat.c libintl.h + +CLEANFILES+= libintl.h + +libintl.h: libgettext.h + @ln -sf ${.OODATE} ${.TARGET} + +.include <bsd.lib.mk> + +.PATH: ${TXIDIR}/intl diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile index 73a371356129..5e83853a11b1 100644 --- a/gnu/usr.bin/texinfo/libtxi/Makefile +++ b/gnu/usr.bin/texinfo/libtxi/Makefile @@ -4,8 +4,8 @@ LIB= txi INTERNALLIB= true INTERNALSTATICLIB= true -SRCS= getopt.c getopt1.c +SRCS= getopt.c getopt1.c xmalloc.c xstrdup.c .include <bsd.lib.mk> -.PATH: ${TXIDIR}/libtxi +.PATH: ${TXIDIR}/lib diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile index a5398940a71f..117c651aa811 100644 --- a/gnu/usr.bin/texinfo/makeinfo/Makefile +++ b/gnu/usr.bin/texinfo/makeinfo/Makefile @@ -4,14 +4,12 @@ PROG= makeinfo NOMAN= yes SRCS= makeinfo.c multi.c -CFLAGS+= -DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 -CFLAGS+= -DHAVE_VARARGS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_ALLOCA=1 -CFLAGS+= -DHAVE_SETVBUF=1 -DHAVE_GETCWD=1 -DHAVE_MEMSET=1 -DHAVE_BZERO=1 -DHAVE_STRCHR=1 -CFLAGS+= -DHAVE_STRCASECMP=1 -DHAVE_VFPRINTF=1 -DHAVE_VSPRINTF=1 -DHAVE_STRERROR=1 -DHAVE_SIGPROCMASK=1 -CFLAGS+= -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi +CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -DLOCALEDIR=\"/usr/share/local\" +CFLAGS+= -I${TXIDIR}/makeinfo -I${TXIDIR} -I${TXIDIR}/lib -I../libintl -DPADD= ${LIBTXI} -LDADD= ${LIBTXI} +DPADD= ${LIBTXI} ${LIBINTL} +LDADD= ${LIBTXI} ${LIBINTL} .include <bsd.prog.mk> |