diff options
| author | bde <bde@FreeBSD.org> | 1997-04-07 16:52:53 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-04-07 16:52:53 +0000 |
| commit | 7e4f8a55046682769028841829c1911fedf7bc9c (patch) | |
| tree | f7fb75a51d69cb5f6048231df9c26cc834055687 /gnu/usr.bin/texinfo/info/Makefile | |
| parent | 8d6ed2803c758cc362bb65dbddcfcd873256b291 (diff) | |
| download | FreeBSD-src-7e4f8a55046682769028841829c1911fedf7bc9c.zip FreeBSD-src-7e4f8a55046682769028841829c1911fedf7bc9c.tar.gz | |
Fixed bugs involving paths:
- LDADD was wrong for non-uniform obj trees.
- DPADD was wrong for separate obj tres.
Cleaned up nearby messes, mostly ones invoving paths:
- -I../libtxi was useless.
- there were too many redefinitions and too many different names for the
same paths.
- use INTERNALLIB* to simplify libtxi/Makefile.
Diffstat (limited to 'gnu/usr.bin/texinfo/info/Makefile')
| -rw-r--r-- | gnu/usr.bin/texinfo/info/Makefile | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile index 9edb4d2..2ba6f06 100644 --- a/gnu/usr.bin/texinfo/info/Makefile +++ b/gnu/usr.bin/texinfo/info/Makefile @@ -1,30 +1,22 @@ -# -# $id$ -# +# $Id$ -INFOSRCDIR= ${.CURDIR}/../../../../contrib/texinfo/info -TXIDIR= ${.CURDIR}/../../../../contrib/texinfo/libtxi -LIBTXI= ${.CURDIR}/../libtxi/libtxi.a -BINDIR= /usr/bin +PROG= info -PROG= info - -SRCS+= dir.c display.c doc.c echo_area.c filesys.c info-utils.c info.c infodoc.c infomap.c +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 -# $(INFODIR) is defined in /usr/share/mk/bsd.own.mk 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../libtxi -I$(TXIDIR) - -LDADD+= -ltermcap -L../libtxi -ltxi -DPADD+= ${LIBTERMCAP} ${LIBTXI} +CFLAGS+= -DHAVE_SIGPROCMASK=1 -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi -.PATH: $(INFOSRCDIR) +DPADD= ${LIBTERMCAP} ${LIBTXI} +LDADD= -ltermcap ${LIBTXI} .include <bsd.prog.mk> + +.PATH: ${TXIDIR}/info |
