From owner-svn-src-stable@freebsd.org  Sat Dec 26 12:06:54 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 13FDBA51304;
 Sat, 26 Dec 2015 12:06:54 +0000 (UTC) (envelope-from ume@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 D66BB1B52;
 Sat, 26 Dec 2015 12:06:53 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBQC6qdO009712;
 Sat, 26 Dec 2015 12:06:52 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBQC6q60009711;
 Sat, 26 Dec 2015 12:06:52 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201512261206.tBQC6q60009711@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sat, 26 Dec 2015 12:06:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292747 - stable/10/lib/liblzma
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Dec 2015 12:06:54 -0000

Author: ume
Date: Sat Dec 26 12:06:52 2015
New Revision: 292747
URL: https://svnweb.freebsd.org/changeset/base/292747

Log:
  MFC 276962:
    Do not regenerate and install liblzma.pc when only build libraries
    aka do not regenerate while generating 32bits libs
  
  Reported by:	Shin-ichi Okano <s-okano__at__n08.itscom.net>

Modified:
  stable/10/lib/liblzma/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/liblzma/Makefile
==============================================================================
--- stable/10/lib/liblzma/Makefile	Sat Dec 26 11:10:44 2015	(r292746)
+++ stable/10/lib/liblzma/Makefile	Sat Dec 26 12:06:52 2015	(r292747)
@@ -155,12 +155,13 @@ CFLAGS+=	-DSYMBOL_VERSIONING
 
 CLEANFILES+=	liblzma.pc
 
+.if !defined(LIBRARIES_ONLY)
 all: liblzma.pc
 liblzma.pc: liblzma.pc.in
 	@sed -e 's,@prefix@,/usr,g ; \
 		s,@exec_prefix@,/usr,g  ; \
-		s,@libdir@,${LIBDIR},g ; \
-		s,@includedir@,${INCLUDEDIR},g ; \
+		s,@libdir@,/usr/lib,g ; \
+		s,@includedir@,/usr/include,g ; \
 		s,@PACKAGE_URL@,http://tukaani.org/xz/,g ; \
 		s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
 		s,@PTHREAD_CFLAGS@,,g ; \
@@ -169,5 +170,6 @@ liblzma.pc: liblzma.pc.in
 beforeinstall:
 	@${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 		liblzma.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+.endif
 
 .include <bsd.lib.mk>