reverting to original version

diff --git a/m4/pkgconfig.am b/m4/pkgconfig.am
index 627ca03..8e96fdf 100644 (file)
--- 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))
 
 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
 
 
 %.pc:                  %.pc.subst Makefile


@@ -51,7 +51,6 @@ pkgconf_SUBST =               s!@"PACKAGE"@!"$(PACKAGE)"!g;                                   \
                                $(BAD_INC_PATHS))       incflags=;;                             \
                                *)                      incflags='-I$${includedir} ';;          \
                        esac;                                                                   \
                                $(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 $@
                        sed -e '$(pkgconf_SUBST)' $< >$@
                        test -z "$(CHMOD_REFERENCE)" || $(CHMOD_REFERENCE) '$<' '$@'
                        chmod a-w $@