new patch for pkg-config in libX11 - much shorter

[Warren Turkal]

I found that I don't need some of the stuff I had in the patch. Here is a
new patch representing that knowledge.

diff -r -u3 -N xc/lib/X11/Imakefile 017_x11-pkg-config-enable.diff/xc/lib
X11/Imakefile
--- xc/lib/X11/Imakefile        2002-11-25 20:31:23.000000000 -0600
+++ xc/lib/X11/Imakefile        2003-09-18 04:23:45.000000000 -0500
@@ -1089,3 +1089,22 @@
 
 BuildIncludes($(HEADERS),IncSubdir,..)
 #endif
+
+
+SUBSTVARS=prefix="$(PROJECTROOT)" \
+         exec_prefix="$(BINDIR)" \
+         libdir="$(USRLIBDIR)" \
+         includedir="$(INCROOT)" \
+         PACKAGE_VERSION="$(SOXLIBREV)" \
+
+all:: X11.pc
+
+X11.pc: X11.pc.in
+       RemoveFile($@)
+       sh config/config-subst $(SUBSTVARS) < X11.pc.in > $@
+
+InstallNonExecFile(X11.pc,$(USRLIBDIR)/pkgconfig)
+
+clean::
+       RemoveFile(X11.pc)
+
diff -r -u3 -N xc/lib/X11/X11.pc.in 017_x11-pkg-config-enable.diff/xc/lib
X11/X11.pc.in
--- xc/lib/X11/X11.pc.in        1969-12-31 18:00:00.000000000 -0600
+++ xc/lib/X11/X11.pc.in        2003-09-18 04:23:45.000000000 -0500
@@ -0,0 +1,11 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+
+Name: X11
+Description: X11 library
+Version: @PACKAGE_VERSION@
+Requires: fontconfig
+Libs: -L${libdir} -lX11
+Cflags: -I${includedir}
diff -r -u3 -N xc/lib/X11/config/config-subst
017_x11-pkg-config-enable.diff/xc/lib/X11/config/config-subst
--- xc/lib/X11/config/config-subst      1969-12-31 18:00:00.000000000 -0600
+++ xc/lib/X11/config/config-subst      2003-09-18 04:23:45.000000000 -0500
@@ -0,0 +1,10 @@
+#!/bin/sh
+script=config-subst.$$
+trap "rm $script" 0
+rm -f $script
+for i in ${1+"$@"}; do
+       var="`echo "$i" | sed 's/=.*$//'`"
+       val="`echo "$i" | sed 's/^[^=]*=//'`"
+       echo "s;@$var@;$val;" >> $script
+done
+sed -f $script

-- 
President, GOLUM, Inc.
http://www.golum.org

_______________________________________________
Devel mailing list
[EMAIL PROTECTED]
http://XFree86.Org/mailman/listinfo/devel