From owner-svn-src-all@FreeBSD.ORG  Wed Dec 10 23:18:12 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1BB689C6;
 Wed, 10 Dec 2014 23:18:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 08BB2302;
 Wed, 10 Dec 2014 23:18:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBANIBNE083328;
 Wed, 10 Dec 2014 23:18:11 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBANIBTk083327;
 Wed, 10 Dec 2014 23:18:11 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201412102318.sBANIBTk083327@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 10 Dec 2014 23:18:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275692 - head/share/termcap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2014 23:18:12 -0000

Author: ngie
Date: Wed Dec 10 23:18:11 2014
New Revision: 275692
URL: https://svnweb.freebsd.org/changeset/base/275692

Log:
  Fix building termcap.db when make obj is run beforehand from a clean tree by
  using make variables for the filenames, which helps resolve pathing
  appropriately when running cap_mkdb
  
  X-MFC with: r275687
  Pointyhat to: me

Modified:
  head/share/termcap/Makefile

Modified: head/share/termcap/Makefile
==============================================================================
--- head/share/termcap/Makefile	Wed Dec 10 22:33:57 2014	(r275691)
+++ head/share/termcap/Makefile	Wed Dec 10 23:18:11 2014	(r275692)
@@ -21,7 +21,7 @@ CAP_MKDB_ENDIAN=
 .endif
 
 termcap.db: termcap
-	cap_mkdb ${CAP_MKDB_ENDIAN} termcap
+	cap_mkdb ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC}
 
 etc-termcap:
 	ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap