From: Thierry Parmentelat Date: Wed, 7 Nov 2007 10:29:22 +0000 (+0000) Subject: cleaned quoting due to a broken build on fc6, on build.one-lab.org at least X-Git-Tag: util-vserver-0.30.214-1~11 X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=10e4af99b8879f1a0ddad9908bc3c838e3aeab96 cleaned quoting due to a broken build on fc6, on build.one-lab.org at least --- diff --git a/m4/pkgconfig.am b/m4/pkgconfig.am index 8e96fdf..a48b0c2 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 @@ -51,6 +51,7 @@ pkgconf_SUBST = s!@'PACKAGE'@!$(PACKAGE)!g; \ $(BAD_INC_PATHS)) incflags=;; \ *) incflags='-I$${includedir} ';; \ esac; \ + echo "sed -e '$(pkgconf_SUBST)' $< >$@"; \ sed -e '$(pkgconf_SUBST)' $< >$@ test -z "$(CHMOD_REFERENCE)" || $(CHMOD_REFERENCE) '$<' '$@' chmod a-w $@