From 116c744b2f086b000adc8c6911a4cb4cae3dc8ca Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 28 Oct 2005 16:03:28 +0000 Subject: [PATCH] do not use multiline sed expressions anymore; instead of, assign and use a Makefile variable git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2188 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/m4/pkgconfig.am | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/util-vserver/m4/pkgconfig.am b/util-vserver/m4/pkgconfig.am index c864288..340ffc1 100644 --- a/util-vserver/m4/pkgconfig.am +++ b/util-vserver/m4/pkgconfig.am @@ -25,6 +25,17 @@ 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 + %.pc: %.pc.subst Makefile rm -f $@ @@ -40,16 +51,6 @@ EXTRA_DIST += $(addsuffix .pc.subst, $(PKGCONFIG_FILES)) $(BAD_INC_PATHS)) incflags=;; \ *) incflags='-I$${includedir} ';; \ esac; \ - sed -e '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' \ - $< >$@ + sed -e '$(pkgconf_SUBST)' $< >$@ test -z "$(CHMOD_REFERENCE)" || $(CHMOD_REFERENCE) '$<' '$@' chmod a-w $@ -- 1.8.1.5