From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 8 Nov 2007 09:43:42 +0000 (+0000)
Subject: reverting to original version
X-Git-Tag: util-vserver-0.30.214-1~9
X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=2fa997d91ca0714d9389c990aeec6b91216023b8

reverting to original version
---

diff --git a/m4/pkgconfig.am b/m4/pkgconfig.am
index 627ca03..8e96fdf 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,7 +51,6 @@ 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 $@