Module Name: src
Committed By: jmmv
Date: Sat Feb 15 02:02:39 UTC 2014
Modified Files:
src/external/bsd/atf: Makefile.inc
Log Message:
Fix path to libtools.a.
The build would break when we do not use MAKEOBJDIR* but do use OBJMACHINE.
Problem found by B Harder and fix based on patch from NONAKA Kimihiro as
posted on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/Makefile.inc
diff -u src/external/bsd/atf/Makefile.inc:1.3 src/external/bsd/atf/Makefile.inc:1.4
--- src/external/bsd/atf/Makefile.inc:1.3 Wed Feb 12 04:08:31 2014
+++ src/external/bsd/atf/Makefile.inc Sat Feb 15 02:02:39 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2014/02/12 04:08:31 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.4 2014/02/15 02:02:39 jmmv Exp $
.include <bsd.own.mk>
@@ -39,8 +39,8 @@ CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # Fo
CPPFLAGS+= -I${SRCDIR}
.if defined(USE_ATF_LIBTOOLS)
-PRIVATELIBDIR!= cd ${TOPDIR}/lib; ${PRINTOBJDIR}
-CPPFLAGS+= -I${PRIVATELIBDIR}/tools
-LDADD+= ${PRIVATELIBDIR}/tools/libtools.a
-DPADD+= ${PRIVATELIBDIR}/tools/libtools.a
+LIBTOOLSOBJDIR!= cd ${TOPDIR}/lib/tools; ${PRINTOBJDIR}
+CPPFLAGS+= -I${LIBTOOLSOBJDIR}
+LDADD+= ${LIBTOOLSOBJDIR}/libtools.a
+DPADD+= ${LIBTOOLSOBJDIR}/libtools.a
.endif
