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.

1 files changed, 8 insertions, 18 deletions

diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile
index a158e10..b70b8d3 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile
+++ b/gnu/usr.bin/texinfo/install-info/Makefile
@@ -1,27 +1,17 @@
-#
-# $Id$
-#
+#	$Id$
 
-TEXIDIR=	${.CURDIR}/../../../../contrib/texinfo
-INSTALLINFODIR=	${TEXIDIR}/util
-TXIDIR=		${TEXIDIR}/libtxi
-LIBTXI=		${.CURDIR}/../libtxi/libtxi.a
-BINDIR=		/usr/bin
+PROG=	install-info
+NOMAN=	yes
 
-PROG= install-info
-NOMAN=yes
-SRCS+= install-info.c
-
-CFLAGS+= -g
 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../libtxi -I$(TXIDIR)
-
-LDADD+= -L../libtxi -ltxi
-DPADD+= ${LIBTXI}
+CFLAGS+= -DHAVE_SIGSETMASK=1 -I${TXIDIR}/libtxi
 
-.PATH: $(INSTALLINFODIR)
+DPADD=	${LIBTXI}
+LDADD=	${LIBTXI}
 
 .include <bsd.prog.mk>
+
+.PATH: ${TXIDIR}/util