Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Dec 2015 12:06:52 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
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
Message-ID:  <201512261206.tBQC6q60009711@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512261206.tBQC6q60009711>