From owner-svn-src-projects@freebsd.org  Sat Oct  8 19:32:19 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87769C06348
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat,  8 Oct 2016 19:32:19 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 3F848693;
 Sat,  8 Oct 2016 19:32:19 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u98JWIpk025497;
 Sat, 8 Oct 2016 19:32:18 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u98JWIvx025494;
 Sat, 8 Oct 2016 19:32:18 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201610081932.u98JWIvx025494@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 8 Oct 2016 19:32:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r306873 - in projects/doctools: etc/mtree share share/me
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Oct 2016 19:32:19 -0000

Author: bapt
Date: Sat Oct  8 19:32:17 2016
New Revision: 306873
URL: https://svnweb.freebsd.org/changeset/base/306873

Log:
  Install the orig_me macros only when DOCTOOLS is installed and under the new
  directory

Modified:
  projects/doctools/etc/mtree/BSD.usr.dist
  projects/doctools/share/Makefile
  projects/doctools/share/me/Makefile

Modified: projects/doctools/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/doctools/etc/mtree/BSD.usr.dist	Sat Oct  8 19:25:22 2016	(r306872)
+++ projects/doctools/etc/mtree/BSD.usr.dist	Sat Oct  8 19:32:17 2016	(r306873)
@@ -321,12 +321,14 @@
             ..
             font
             ..
+            me
+            ..
+            nterm
+            ..
             pub
             ..
             tmac
             ..
-            nterm
-            ..
         ..
         dtrace
         ..

Modified: projects/doctools/share/Makefile
==============================================================================
--- projects/doctools/share/Makefile	Sat Oct  8 19:25:22 2016	(r306872)
+++ projects/doctools/share/Makefile	Sat Oct  8 19:32:17 2016	(r306873)
@@ -49,9 +49,7 @@ _dict=		dict
 _examples=	examples
 .endif
 
-.if ${MK_GROFF} != "no"
-_me=		me
-.endif
+SUBDIR.${MK_DOCTOOLS}+=		me
 
 .if ${MK_ICONV} != "no"
 _i18n=		i18n

Modified: projects/doctools/share/me/Makefile
==============================================================================
--- projects/doctools/share/me/Makefile	Sat Oct  8 19:25:22 2016	(r306872)
+++ projects/doctools/share/me/Makefile	Sat Oct  8 19:32:17 2016	(r306873)
@@ -1,8 +1,8 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/27/94
 # $FreeBSD$
 
-MELIB=	${BINDIR}/me
-TMLIB=	${BINDIR}/tmac
+MELIB=	${BINDIR}/doctools/me
+TMLIB=	${BINDIR}/doctools/tmac
 MESRCS=	acm.me chars.me deltext.me eqn.me float.me footnote.me \
 	index.me letterhead.me local.me null.me refer.me sh.me \
 	tbl.me thesis.me