From c649a2edc134bf8f96d24e8191ab93e0d366402e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 12 Jan 2018 15:23:31 -0500
Subject: Install pc files in $datadir not $libdir

There's nothing arch-specific about any of this.

Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 Makefile.am | 76 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0518614..1e0f6b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ applewm_HEADERS = \
         applewmconst.h \
 	applewmproto.h
 
-applewmprotopkgconfigdir = $(libdir)/pkgconfig
+applewmprotopkgconfigdir = $(datadir)/pkgconfig
 applewmprotopkgconfig_DATA = applewmproto.pc
 
 bigreqsdir = $(includedir)/X11/extensions
@@ -11,14 +11,14 @@ bigreqs_HEADERS = \
 	bigreqsproto.h \
 	bigreqstr.h
 
-bigreqsprotopkgconfigdir = $(libdir)/pkgconfig
+bigreqsprotopkgconfigdir = $(datadir)/pkgconfig
 bigreqsprotopkgconfig_DATA = bigreqsproto.pc
 
 if LEGACY
 XCalibrateincludedir = $(includedir)/X11/extensions
 XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h
 
-calibrateprotopkgconfigdir = $(libdir)/pkgconfig
+calibrateprotopkgconfigdir = $(datadir)/pkgconfig
 calibrateprotopkgconfig_DATA = xcalibrateproto.pc
 
 calibrateproto_EXTRA_DIST = autogen.sh xcalibrateproto.pc.in
@@ -29,7 +29,7 @@ composite_HEADERS = \
 	composite.h \
 	compositeproto.h
 
-compositeprotopkgconfigdir = $(libdir)/pkgconfig
+compositeprotopkgconfigdir = $(datadir)/pkgconfig
 compositeprotopkgconfig_DATA = compositeproto.pc
 
 damagedir = $(includedir)/X11/extensions
@@ -37,7 +37,7 @@ damage_HEADERS = \
 	damageproto.h \
 	damagewire.h
 
-damageprotopkgconfigdir = $(libdir)/pkgconfig
+damageprotopkgconfigdir = $(datadir)/pkgconfig
 damageprotopkgconfig_DATA = damageproto.pc
 
 dmxdir = $(includedir)/X11/extensions
@@ -45,19 +45,19 @@ dmx_HEADERS = \
 	dmx.h \
 	dmxproto.h
 
-dmxprotopkgconfigdir = $(libdir)/pkgconfig
+dmxprotopkgconfigdir = $(datadir)/pkgconfig
 dmxprotopkgconfig_DATA = dmxproto.pc
 
 dri2dir = $(includedir)/X11/extensions
 dri2_HEADERS = dri2proto.h dri2tokens.h
 
-dri2protopkgconfigdir = $(libdir)/pkgconfig
+dri2protopkgconfigdir = $(datadir)/pkgconfig
 dri2protopkgconfig_DATA = dri2proto.pc
 
 dri3dir = $(includedir)/X11/extensions
 dri3_HEADERS = dri3proto.h
 
-dri3protopkgconfigdir = $(libdir)/pkgconfig
+dri3protopkgconfigdir = $(datadir)/pkgconfig
 dri3protopkgconfig_DATA = dri3proto.pc
 
 if LEGACY
@@ -66,7 +66,7 @@ evie_HEADERS = \
 	evieproto.h \
 	Xeviestr.h
 
-evieprotopkgconfigdir = $(libdir)/pkgconfig
+evieprotopkgconfigdir = $(datadir)/pkgconfig
 evieprotopkgconfig_DATA = evieproto.pc
 
 evieproto_EXTRA_DIST = evieproto.pc.in
@@ -77,7 +77,7 @@ fixes_HEADERS = \
 	xfixesproto.h \
 	xfixeswire.h
 
-fixesprotopkgconfigdir = $(libdir)/pkgconfig
+fixesprotopkgconfigdir = $(datadir)/pkgconfig
 fixesprotopkgconfig_DATA = fixesproto.pc
 
 if LEGACY
@@ -87,7 +87,7 @@ fontcache_HEADERS = \
 	fontcacheP.h \
 	fontcachstr.h
 
-fontcacheprotopkgconfigdir = $(libdir)/pkgconfig
+fontcacheprotopkgconfigdir = $(datadir)/pkgconfig
 fontcacheprotopkgconfig_DATA = fontcacheproto.pc
 
 fontcacheproto_EXTRA_DIST = fontcacheproto.pc.in
@@ -102,7 +102,7 @@ fonts_HEADERS = \
 	fsmasks.h \
 	FSproto.h
 
-fontsprotopkgconfigdir = $(libdir)/pkgconfig
+fontsprotopkgconfigdir = $(datadir)/pkgconfig
 fontsprotopkgconfig_DATA = fontsproto.pc
 
 gldir = $(includedir)/GL
@@ -116,7 +116,7 @@ glinternaldir = $(includedir)/GL/internal
 glinternal_HEADERS = \
 	include/GL/internal/glcore.h
 
-glprotopkgconfigdir = $(libdir)/pkgconfig
+glprotopkgconfigdir = $(datadir)/pkgconfig
 glprotopkgconfig_DATA = glproto.pc
 
 glproto_EXTRA_DIST = meson.build
@@ -128,7 +128,7 @@ input_HEADERS = \
 	XI2.h \
 	XI2proto.h
 
-inputprotopkgconfigdir = $(libdir)/pkgconfig
+inputprotopkgconfigdir = $(datadir)/pkgconfig
 inputprotopkgconfig_DATA = inputproto.pc
 
 kbdir = $(includedir)/X11/extensions
@@ -139,14 +139,14 @@ kb_HEADERS = \
 	XKBsrv.h \
 	XKBstr.h
 
-kbprotopkgconfigdir = $(libdir)/pkgconfig
+kbprotopkgconfigdir = $(datadir)/pkgconfig
 kbprotopkgconfig_DATA = kbproto.pc
 
 if LEGACY
 lg3ddir = $(includedir)/X11/extensions
 lg3d_HEADERS = lgewire.h
 
-lg3dprotopkgconfigdir = $(libdir)/pkgconfig
+lg3dprotopkgconfigdir = $(datadir)/pkgconfig
 lg3dprotopkgconfig_DATA = lg3dproto.pc
 
 lg3dproto_EXTRA_DIST = autogen.sh lg3dproto.pc.in
@@ -157,7 +157,7 @@ xproxymng_HEADERS = \
 	PM.h \
 	PMproto.h
 
-pmprotopkgconfigdir = $(libdir)/pkgconfig
+pmprotopkgconfigdir = $(datadir)/pkgconfig
 pmprotopkgconfig_DATA = xproxymngproto.pc
 
 pmproto_EXTRA_DIST = xproxymngproto.pc.in
@@ -165,7 +165,7 @@ pmproto_EXTRA_DIST = xproxymngproto.pc.in
 presentdir = $(includedir)/X11/extensions
 present_HEADERS = presentproto.h presenttokens.h
 
-presentprotopkgconfigdir = $(libdir)/pkgconfig
+presentprotopkgconfigdir = $(datadir)/pkgconfig
 presentprotopkgconfig_DATA = presentproto.pc
 
 if LEGACY
@@ -174,7 +174,7 @@ print_HEADERS = \
 	Print.h \
 	Printstr.h
 
-printprotopkgconfigdir = $(libdir)/pkgconfig
+printprotopkgconfigdir = $(datadir)/pkgconfig
 printprotopkgconfig_DATA = printproto.pc
 
 miscmandir = $(MISC_MAN_DIR)
@@ -200,7 +200,7 @@ MAN_SUBSTS = \
         -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
         -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
         -e 's|__datadir__|$(datadir)|g' \
-        -e 's|__libdir__|$(libdir)|g' \
+        -e 's|__datadir__|$(libdir)|g' \
         -e 's|__sysconfdir__|$(sysconfdir)|g' \
         -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
         -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
@@ -218,7 +218,7 @@ randr_HEADERS = \
 	randr.h \
 	randrproto.h
 
-randrprotopkgconfigdir = $(libdir)/pkgconfig
+randrprotopkgconfigdir = $(datadir)/pkgconfig
 randrprotopkgconfig_DATA = randrproto.pc
 
 recorddir = $(includedir)/X11/extensions
@@ -227,7 +227,7 @@ record_HEADERS = \
 	recordproto.h \
 	recordstr.h
 
-recordprotopkgconfigdir = $(libdir)/pkgconfig
+recordprotopkgconfigdir = $(datadir)/pkgconfig
 recordprotopkgconfig_DATA = recordproto.pc
 
 renderdir = $(includedir)/X11/extensions
@@ -235,14 +235,14 @@ render_HEADERS = \
 	render.h \
 	renderproto.h
 
-renderprotopkgconfigdir = $(libdir)/pkgconfig
+renderprotopkgconfigdir = $(datadir)/pkgconfig
 renderprotopkgconfig_DATA = renderproto.pc
 
 resourcedir = $(includedir)/X11/extensions
 resource_HEADERS = \
 	XResproto.h
 
-resourceprotopkgconfigdir = $(libdir)/pkgconfig
+resourceprotopkgconfigdir = $(datadir)/pkgconfig
 resourceprotopkgconfig_DATA = resourceproto.pc
 
 scrnsaverdir = $(includedir)/X11/extensions
@@ -250,7 +250,7 @@ scrnsaver_HEADERS = \
 	saver.h \
 	saverproto.h
 
-scrnsaverprotopkgconfigdir = $(libdir)/pkgconfig
+scrnsaverprotopkgconfigdir = $(datadir)/pkgconfig
 scrnsaverprotopkgconfig_DATA = scrnsaverproto.pc
 
 trapdir = $(includedir)/X11/extensions
@@ -263,7 +263,7 @@ trap_HEADERS = \
 	xtraplibp.h \
 	xtrapproto.h
 
-trapprotopkgconfigdir = $(libdir)/pkgconfig
+trapprotopkgconfigdir = $(datadir)/pkgconfig
 trapprotopkgconfig_DATA = trapproto.pc
 
 trapproto_EXTRA_DIST = trapproto.pc.in
@@ -276,7 +276,7 @@ video_HEADERS = \
 	XvMCproto.h \
 	Xvproto.h
 
-videoprotopkgconfigdir = $(libdir)/pkgconfig
+videoprotopkgconfigdir = $(datadir)/pkgconfig
 videoprotopkgconfig_DATA = videoproto.pc
 
 windowswmdir = $(includedir)/X11/extensions
@@ -284,7 +284,7 @@ windowswm_HEADERS = \
         windowswm.h \
 	windowswmstr.h
 
-windowswmprotopkgconfigdir = $(libdir)/pkgconfig
+windowswmprotopkgconfigdir = $(datadir)/pkgconfig
 windowswmprotopkgconfig_DATA = windowswmproto.pc
 
 xprotodir = $(includedir)/X11
@@ -318,7 +318,7 @@ nodist_xproto_HEADERS = \
 	Xfuncproto.h \
 	Xpoll.h
 
-x11protopkgconfigdir = $(libdir)/pkgconfig
+x11protopkgconfigdir = $(datadir)/pkgconfig
 x11protopkgconfig_DATA = xproto.pc
 
 xcmiscdir = $(includedir)/X11/extensions
@@ -326,7 +326,7 @@ xcmisc_HEADERS = \
 	xcmiscproto.h \
 	xcmiscstr.h
 
-xcmiscprotopkgconfigdir = $(libdir)/pkgconfig
+xcmiscprotopkgconfigdir = $(datadir)/pkgconfig
 xcmiscprotopkgconfig_DATA = xcmiscproto.pc
 
 xextdir = $(includedir)/X11/extensions
@@ -368,7 +368,7 @@ compat_HEADERS = \
 	shmstr.h \
 	syncstr.h
 
-xextprotopkgconfigdir = $(libdir)/pkgconfig
+xextprotopkgconfigdir = $(datadir)/pkgconfig
 xextprotopkgconfig_DATA = xextproto.pc
 
 xf86bigfontdir = $(includedir)/X11/extensions
@@ -377,7 +377,7 @@ xf86bigfont_HEADERS = \
 	xf86bigfproto.h \
 	xf86bigfstr.h
 
-xf86bigfontprotopkgconfigdir = $(libdir)/pkgconfig
+xf86bigfontprotopkgconfigdir = $(datadir)/pkgconfig
 xf86bigfontprotopkgconfig_DATA = xf86bigfontproto.pc
 
 xf86dgadir = $(includedir)/X11/extensions
@@ -390,13 +390,13 @@ xf86dga_HEADERS = \
 	xf86dgaproto.h \
 	xf86dgastr.h
 
-xf86dgaprotopkgconfigdir = $(libdir)/pkgconfig
+xf86dgaprotopkgconfigdir = $(datadir)/pkgconfig
 xf86dgaprotopkgconfig_DATA = xf86dgaproto.pc
 
 xf86dridir = $(includedir)/X11/dri
 xf86dri_HEADERS = xf86dri.h xf86dristr.h xf86driproto.h
 
-xf86driprotopkgconfigdir = $(libdir)/pkgconfig
+xf86driprotopkgconfigdir = $(datadir)/pkgconfig
 xf86driprotopkgconfig_DATA = xf86driproto.pc
 
 xf86miscdir = $(includedir)/X11/extensions
@@ -404,7 +404,7 @@ xf86misc_HEADERS = \
 	xf86misc.h \
 	xf86mscstr.h
 
-xf86miscprotopkgconfigdir = $(libdir)/pkgconfig
+xf86miscprotopkgconfigdir = $(datadir)/pkgconfig
 xf86miscprotopkgconfig_DATA = xf86miscproto.pc
 
 xf86miscproto_EXTRA_DIST = xf86miscproto.pc.in
@@ -415,7 +415,7 @@ xf86rush_HEADERS = \
 	xf86rush.h \
 	xf86rushstr.h
 
-xf86rushprotopkgconfigdir = $(libdir)/pkgconfig
+xf86rushprotopkgconfigdir = $(datadir)/pkgconfig
 xf86rushprotopkgconfig_DATA = xf86rushproto.pc
 
 xf86rushproto_EXTRA_DIST = xf86rushproto.pc.in
@@ -427,14 +427,14 @@ xf86vidmode_HEADERS = \
 	xf86vmproto.h \
 	xf86vmstr.h
 
-xf86vidmodeprotopkgconfigdir = $(libdir)/pkgconfig
+xf86vidmodeprotopkgconfigdir = $(datadir)/pkgconfig
 xf86vidmodeprotopkgconfig_DATA = xf86vidmodeproto.pc
 
 xineramadir = $(includedir)/X11/extensions
 xinerama_HEADERS = \
 	panoramiXproto.h
 
-xineramaprotopkgconfigdir = $(libdir)/pkgconfig
+xineramaprotopkgconfigdir = $(datadir)/pkgconfig
 xineramaprotopkgconfig_DATA = xineramaproto.pc
 
 # SUBDIRS=specs
-- 
cgit v1.2.3