From 422e5a80cbb3df8e28b95c305675e38292400a7e Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 8 Nov 2007 09:00:27 +0000 Subject: [PATCH] Daniel has a point, that the @VAR@ strings need to be protected against configure expansion We thus introduce quoting again here, but using only double quotes seems a safer choice though: This variable is used as sed -e '$(pkgconf_SUBST)' so quote matching does not happen the way it seems at first glance --- m4/pkgconfig.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/m4/pkgconfig.am b/m4/pkgconfig.am index a48b0c2..627ca03 100644 --- a/m4/pkgconfig.am +++ b/m4/pkgconfig.am @@ -25,16 +25,16 @@ pkgconf_DATA = $(addsuffix .pc, $(PKGCONFIG_FILES)) CLEANFILES += $(addsuffix .pc, $(PKGCONFIG_FILES)) EXTRA_DIST += $(addsuffix .pc.subst, $(PKGCONFIG_FILES)) -pkgconf_SUBST = s!@PACKAGE@!"$(PACKAGE)"!g; \ - s!@VERSION@!"$(VERSION)"!g; \ - s!@prefix@!"$(prefix)"!g; \ - s!@exec_prefix@!"$(exec_prefix)"!g; \ - s!@libdir@!"$(libdir)"!g; \ - s!@includedir@!"$(includedir)"!g; \ - s!@libflags@!"$${libflags}$(pkgconf_LIBFLAGS)"!g; \ - s!@incflags@!"$${incflags}$(pkgconf_INCFLAGS)"!g; \ - s!@pkgincflags@!"$${pkgincflags}$(pkgconf_PKGINCFLAGS)"!g; \ - s!@pkgincludedir@!"$(pkgincludedir)"!g +pkgconf_SUBST = s!@"PACKAGE"@!"$(PACKAGE)"!g; \ + s!@"VERSION"@!"$(VERSION)"!g; \ + s!@"prefix"@!"$(prefix)"!g; \ + s!@"exec_prefix"@!"$(exec_prefix)"!g; \ + s!@"libdir"@!"$(libdir)"!g; \ + s!@"includedir"@!"$(includedir)"!g; \ + s!@"libflags"@!"$${libflags}$(pkgconf_LIBFLAGS)"!g; \ + s!@"incflags"@!"$${incflags}$(pkgconf_INCFLAGS)"!g; \ + s!@"pkgincflags"@!"$${pkgincflags}$(pkgconf_PKGINCFLAGS)"!g; \ + s!@"pkgincludedir"@!"$(pkgincludedir)"!g %.pc: %.pc.subst Makefile -- 2.43.0