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.
This commit is contained in:
parent
f7124908f3
commit
e633c437ef
@ -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}/../libtxi)
|
||||
LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a
|
||||
LIBINTL = ${.OBJDIR}/../libintl/libintl.a
|
||||
.if exists(${.OBJDIR}/../libintl)
|
||||
LIBINTL= ${.OBJDIR}/../libintl/libintl.a
|
||||
.else
|
||||
LIBTXI= ${.CURDIR}/../libtxi/libtxi.a
|
||||
LIBINTL = ${.CURDIR}/../libintl/libintl.a
|
||||
LIBINTL= ${.CURDIR}/../libintl/libintl.a
|
||||
.endif
|
||||
|
||||
.include "../../Makefile.inc"
|
||||
.if exists(${.OBJDIR}/../libtxi)
|
||||
LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a
|
||||
.else
|
||||
LIBTXI= ${.CURDIR}/../libtxi/libtxi.a
|
||||
.endif
|
||||
|
||||
.include "../Makefile.inc"
|
||||
|
Loading…
x
Reference in New Issue
Block a user