commit 960cdcc78444ff69a142c312cb811218baf2c739
author Paul Wankadia <junyer@google.com> Mon Aug 26 03:55:18 2019 -0700
committer Paul Wankadia <junyer@google.com> Mon Aug 26 10:56:14 2019 +0000
tree c3a58ffe93d936b31257c1f78c3638c1fc9bf4bf
parent be0e1305d264b2cbe1d35db66b8c5107fc2a727e

Simplify the plumbing for re2.pc.

Change-Id: I6503b73978c9b2f4693422b62a74d4e1c75409c7
Reviewed-on: https://code-review.googlesource.com/c/re2/+/44491
Reviewed-by: Paul Wankadia <junyer@google.com>

Makefile

diff --git a/Makefile b/Makefile
index f001f06..3571611 100644
--- a/Makefile
+++ b/Makefile
@@ -276,10 +276,8 @@
 	ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER)
 	ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXT)
 	$(INSTALL_DATA) re2.pc $(DESTDIR)$(libdir)/pkgconfig/re2.pc
-	$(SED_INPLACE) -e "s#@prefix@#${prefix}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
-	$(SED_INPLACE) -e "s#@exec_prefix@#${exec_prefix}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
-	$(SED_INPLACE) -e "s#@includedir@#${includedir}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
-	$(SED_INPLACE) -e "s#@libdir@#${libdir}#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
+	$(SED_INPLACE) -e "s#@includedir@#$(includedir)#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
+	$(SED_INPLACE) -e "s#@libdir@#$(libdir)#" $(DESTDIR)$(libdir)/pkgconfig/re2.pc
 
 testinstall: static-testinstall shared-testinstall
 	@echo

re2.pc

diff --git a/re2.pc b/re2.pc
index d66cf51..50fd637 100644
--- a/re2.pc
+++ b/re2.pc
@@ -1,5 +1,3 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
 includedir=@includedir@
 libdir=@libdir@