X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=m4%2Fpkgconfig.am;h=a48b0c20e1569fb02e9ff7de904014d6952061f5;hb=10e4af99b8879f1a0ddad9908bc3c838e3aeab96;hp=e17d2af30d15802847f66d87fbac785e31c9e96e;hpb=2822ba293eb308225c50d346930c47bf98d9927b;p=util-vserver.git

diff --git a/m4/pkgconfig.am b/m4/pkgconfig.am
index e17d2af..a48b0c2 100644
--- a/m4/pkgconfig.am
+++ b/m4/pkgconfig.am
@@ -1,4 +1,4 @@
-## $Id: pkgconfig.am,v 1.1 2003/10/13 19:50:29 ensc Exp $	---*- makefile -*---
+## $Id: pkgconfig.am 2188 2005-10-28 16:03:28Z ensc $	---*- makefile -*---
 
 ## Copyright (C) 2002 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
@@ -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,7 @@ 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'				\
-                        $< >$@
+			echo "sed -e '$(pkgconf_SUBST)'  $< >$@";				\
+			sed -e '$(pkgconf_SUBST)' $< >$@
 			test -z "$(CHMOD_REFERENCE)" || $(CHMOD_REFERENCE) '$<' '$@'
 			chmod a-w $@