--- xc/lib/Xcomposite/Imakefile.orig	2004-11-06 09:46:25 +0300
+++ xc/lib/Xcomposite/Imakefile	2004-11-06 09:51:27 +0300
@@ -61,7 +61,7 @@
 	RemoveFile($@)
 	sh ../Xcursor/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@
 
-InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig)
+InstallNonExecFile(xcomposite.pc,$(PKGCONFIGDIR))
 
 clean::
 	RemoveFile(xcomposite.pc)
--- xc/lib/Xcursor/Imakefile.orig	2004-11-06 09:46:25 +0300
+++ xc/lib/Xcursor/Imakefile	2004-11-06 09:51:27 +0300
@@ -87,7 +87,7 @@
 	RemoveFile($@)
 	sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@
 
-InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig)
+InstallNonExecFile(xcursor.pc,$(PKGCONFIGDIR))
 
 clean::
 	RemoveFile(xcursor.pc)
--- xc/lib/Xdamage/Imakefile.orig	2004-11-06 09:46:25 +0300
+++ xc/lib/Xdamage/Imakefile	2004-11-06 09:51:27 +0300
@@ -61,7 +61,7 @@
 	RemoveFile($@)
 	sh ../Xcursor/config-subst $(SUBSTVARS) < xdamage.pc.in > $@
 
-InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig)
+InstallNonExecFile(xdamage.pc,$(PKGCONFIGDIR))
 
 clean::
 	RemoveFile(xdamage.pc)
--- xc/lib/Xevie/Imakefile.orig	2004-11-06 09:46:25 +0300
+++ xc/lib/Xevie/Imakefile	2004-11-06 09:51:27 +0300
@@ -66,7 +66,7 @@
 	RemoveFile($@)
 	sh ../Xcursor/config-subst $(SUBSTVARS) < xevie.pc.in > $@
 
-InstallNonExecFile(xevie.pc,$(USRLIBDIR)/pkgconfig)
+InstallNonExecFile(xevie.pc,$(PKGCONFIGDIR))
 
 clean::
 	RemoveFile(xevie.pc)
--- xc/lib/Xfixes/Imakefile.orig	2004-11-06 09:46:25 +0300
+++ xc/lib/Xfixes/Imakefile	2004-11-06 09:51:27 +0300
@@ -68,7 +68,7 @@
 	RemoveFile($@)
 	sh ../Xcursor/config-subst $(SUBSTVARS) < xfixes.pc.in > $@
 
-InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig)
+InstallNonExecFile(xfixes.pc,$(PKGCONFIGDIR))
 
 clean::
 	RemoveFile(xfixes.pc)
--- xc/lib/Xft/Imakefile.orig	2004-11-06 09:46:25 +0300
+++ xc/lib/Xft/Imakefile	2004-11-06 09:51:27 +0300
@@ -136,7 +136,7 @@
 	RemoveFile($@)
 	sh config/config-subst $(SUBSTVARS) < xft.pc.in > $@
 
-InstallNonExecFile(xft.pc,$(USRLIBDIR)/pkgconfig)
+InstallNonExecFile(xft.pc,$(PKGCONFIGDIR))
 
 clean::
 	RemoveFile(xft.pc)
--- xc/lib/Xrender/Imakefile.orig	2004-11-06 09:46:25 +0300
+++ xc/lib/Xrender/Imakefile	2004-11-06 09:51:27 +0300
@@ -161,7 +161,7 @@
 	RemoveFile($@)
 	sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@
 
-InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig)
+InstallNonExecFile(xrender.pc,$(PKGCONFIGDIR))
 
 clean::
 	RemoveFile(xrender.pc)
--- xc/lib/fontconfig/Imakefile.orig	2004-11-06 09:46:25 +0300
+++ xc/lib/fontconfig/Imakefile	2004-11-06 09:51:27 +0300
@@ -151,7 +151,7 @@
 	$(CONFIG_SUBST_PROG) $(SUBSTVARS) < fontconfig.pc.in > $@
 
 #if InstallFontconfigLibrary
-InstallNonExecFile(fontconfig.pc,$(USRLIBDIR)/pkgconfig)
+InstallNonExecFile(fontconfig.pc,$(PKGCONFIGDIR))
 #endif
 
 clean::