diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1999-01-20 02:08:07 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1999-01-20 02:08:07 +0000 |
| commit | e633c437efd6056619a0cd7e05c59a028c378b61 (patch) | |
| tree | 1cd342873fb00d2d94014221833ec334a5c1ad51 /gnu | |
| parent | f7124908f3c4f2670671d3dc615573be815ae01c (diff) | |
| download | src-e633c437efd6056619a0cd7e05c59a028c378b61.tar.gz src-e633c437efd6056619a0cd7e05c59a028c378b61.zip | |
Fixed ifdef for libintl in previous commit (the location of libintl.a's
obj dir is only indirectly related to the location of libtxi.a's obj
dir).
Fixed about 3 style bugs in previous commit.
Fixed my bug in rev.1.7. "../../Makefile.inc" worked as an alias for
"../Makefile.inc" in some cases, but it gives endless recursion when
there is an obj dir in one of the subdirs.
Notes
Notes:
svn path=/head/; revision=42877
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/texinfo/Makefile.inc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc index 80ba03860de2..08a475c92413 100644 --- a/gnu/usr.bin/texinfo/Makefile.inc +++ b/gnu/usr.bin/texinfo/Makefile.inc @@ -1,13 +1,17 @@ -# $Id$ +# $Id: Makefile.inc,v 1.8 1999/01/14 20:00:26 markm Exp $ -TXIDIR= ${.CURDIR}/../../../../contrib/texinfo +TXIDIR= ${.CURDIR}/../../../../contrib/texinfo + +.if exists(${.OBJDIR}/../libintl) +LIBINTL= ${.OBJDIR}/../libintl/libintl.a +.else +LIBINTL= ${.CURDIR}/../libintl/libintl.a +.endif .if exists(${.OBJDIR}/../libtxi) -LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a -LIBINTL = ${.OBJDIR}/../libintl/libintl.a +LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a .else -LIBTXI= ${.CURDIR}/../libtxi/libtxi.a -LIBINTL = ${.CURDIR}/../libintl/libintl.a +LIBTXI= ${.CURDIR}/../libtxi/libtxi.a .endif -.include "../../Makefile.inc" +.include "../Makefile.inc" |