Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Oct 2016 01:25:04 +0000 (UTC)
From:      "Carlos J. Puga Medina" <cpm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r424299 - head/devel/jsoncpp
Message-ID:  <201610200125.u9K1P4U8041482@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cpm
Date: Thu Oct 20 01:25:03 2016
New Revision: 424299
URL: https://svnweb.freebsd.org/changeset/ports/424299

Log:
  devel/jsoncpp: Fix bad REINPLACE_CMD of jsoncpp.pc
  
  - Remove extra ${PREFIX} in jsoncpp/Makefile
  
  % pkgconf --libs --cflags jsoncpp
  -I/usr/local//usr/local/include/jsoncpp -L/usr/local//usr/local/lib -ljsoncpp
  
  Notice the extra /usr/local.
  
  PR:		213553
  Reported by:	John Hein <z7dr6ut7gs@snkmail.com>
  Approved by:	yuri@rawbw.com (maintainer), koobs (mentor)
  MFH:		2016Q4

Modified:
  head/devel/jsoncpp/Makefile

Modified: head/devel/jsoncpp/Makefile
==============================================================================
--- head/devel/jsoncpp/Makefile	Thu Oct 20 01:16:16 2016	(r424298)
+++ head/devel/jsoncpp/Makefile	Thu Oct 20 01:25:03 2016	(r424299)
@@ -41,8 +41,8 @@ do-install:
 	${CP} ${WRKSRC}/pkg-config/jsoncpp.pc.in ${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
 	@${REINPLACE_CMD} -i '' \
 		-e 's|@CMAKE_INSTALL_PREFIX@|${PREFIX}|g' \
-		-e 's|@LIBRARY_INSTALL_DIR@|${PREFIX}/lib|g' \
-		-e 's|@INCLUDE_INSTALL_DIR@|${PREFIX}/include/jsoncpp|g' \
+		-e 's|@LIBRARY_INSTALL_DIR@|lib|g' \
+		-e 's|@INCLUDE_INSTALL_DIR@|include/jsoncpp|g' \
 		-e 's|@JSONCPP_VERSION@|${DISTVERSION}|g' \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/jsoncpp.pc
 



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