summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/texinfo
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1999-01-20 02:08:07 +0000
committerbde <bde@FreeBSD.org>1999-01-20 02:08:07 +0000
commit8421f831f874fab5fd0c7d3c9f4ea9851272d5cb (patch)
tree563a2f9e191096db725e8753073605e6e3181752 /gnu/usr.bin/texinfo
parent516bd410eece16441156baacad763bf05482f1de (diff)
downloadFreeBSD-src-8421f831f874fab5fd0c7d3c9f4ea9851272d5cb.zip
FreeBSD-src-8421f831f874fab5fd0c7d3c9f4ea9851272d5cb.tar.gz
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.
Diffstat (limited to 'gnu/usr.bin/texinfo')
-rw-r--r--gnu/usr.bin/texinfo/Makefile.inc18
1 files changed, 11 insertions, 7 deletions
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index 80ba038..08a475c 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"
OpenPOWER on IntegriCloud