Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/atf Fix path to libtools.a.



details:   https://anonhg.NetBSD.org/src/rev/ed5f51754692
branches:  trunk
changeset: 326727:ed5f51754692
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Feb 15 02:02:39 2014 +0000

description:
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.

diffstat:

 external/bsd/atf/Makefile.inc |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (22 lines):

diff -r b323bf986b22 -r ed5f51754692 external/bsd/atf/Makefile.inc
--- a/external/bsd/atf/Makefile.inc     Sat Feb 15 01:54:17 2014 +0000
+++ b/external/bsd/atf/Makefile.inc     Sat Feb 15 02:02:39 2014 +0000
@@ -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${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



Home | Main Index | Thread Index | Old Index