From 19dd50990def0229b18dfdc2a9a2ab6f3491f9de Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 23 Jun 2021 20:41:38 +0200 Subject: Autotools: Simplify expat.pc templating (now that we can) --- expat/configure.ac | 3 --- expat/expat.pc.in | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/expat/configure.ac b/expat/configure.ac index edc95ea4..6c1016e1 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -394,9 +394,6 @@ AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_CXXFLAGS]) AC_SUBST([AM_LDFLAGS]) -dnl updating _EXPAT_LIBRARY_NAME variable to effect the package name in expat.pc file (issues #361 and #495) -AC_SUBST(_EXPAT_LIBRARY_NAME, ["$PACKAGE_NAME"]) - AS_CASE("${host_os}", [darwin*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__macos.cmake.in], [mingw*], [CMAKE_NOCONFIG_SOURCE=cmake/autotools/expat-noconfig__windows.cmake.in], diff --git a/expat/expat.pc.in b/expat/expat.pc.in index 3cd2e765..3a1a4609 100644 --- a/expat/expat.pc.in +++ b/expat/expat.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: @_EXPAT_LIBRARY_NAME@ +Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Description: expat XML parser URL: https://libexpat.github.io/ -Libs: -L${libdir} -l@_EXPAT_LIBRARY_NAME@ +Libs: -L${libdir} -l@PACKAGE_NAME@ Cflags: -I${includedir} -- cgit v1.2.1