Use patch instead of sed to fix extraneous comma in quesoglc pkg-config file.

master
safety0ff 2011-03-04 12:33:06 -05:00
parent 12e5d2a2b8
commit d3e993da31
2 changed files with 28 additions and 1 deletions

View File

@ -41,7 +41,7 @@ $(TOPDIR)/build/libs/lib/libGLC.la: $(PKG_SOURCEBASE)/build/libGLC.la
$(MAKE) -C $(PKG_SOURCEBASE)/build install-libLTLIBRARIES
$(PKG_SOURCEBASE)/quesoglc.pc: $(PKG_SOURCEBASE)/config.status
$(MAKE) -C $(PKG_SOURCEBASE) quesoglc.pc && sed -i -e "s/,\s*$$//" $(PKG_SOURCEBASE)/quesoglc.pc # Remove extraneous comma (autoconfigure artifact)
$(MAKE) -C $(PKG_SOURCEBASE) quesoglc.pc
$(TOPDIR)/build/libs/lib/pkgconfig/quesoglc.pc: $(PKG_SOURCEBASE)/quesoglc.pc
$(MAKE) -C $(PKG_SOURCEBASE) install-pkgconfigDATA

View File

@ -0,0 +1,27 @@
Index: $sourcebase/configure.in
===================================================================
--- $sourcebase/configure.in (revision 913)
+++ $sourcebase/configure.in (working copy)
@@ -143,7 +143,7 @@
FRIBIDI_OBJ="libGLC_la-fribidi.lo libGLC_la-fribidi_char_type.lo \
libGLC_la-fribidi_mirroring.lo libGLC_la-fribidi_types.lo"
else
- PKGCONFIG_REQUIREMENTS="fribidi"
+ PKGCONFIG_REQUIREMENTS=", fribidi"
fi
# Checks for OpenGL and related libraries.
Index: $sourcebase/quesoglc.pc.in
===================================================================
--- $sourcebase/quesoglc.pc.in (revision 913)
+++ $sourcebase/quesoglc.pc.in (working copy)
@@ -9,7 +9,7 @@
Description: An implementation of SGI's OpenGL Character Renderer (GLC). The OpenGL Character Renderer (GLC) is a state machine that provides OpenGL programs with character rendering services via an application programming interface (API).
URL: http://quesoglc.sourceforge.net
Version: @VERSION@
-Requires: fontconfig, freetype2, @PKGCONFIG_REQUIREMENTS@
+Requires: fontconfig, freetype2@PKGCONFIG_REQUIREMENTS@
Conflicts:
Libs: -L${libdir} -lGLC
Libs.private: @PKGCONFIG_LIBS_PRIVATE@