8 files changed, 16 insertions, 12 deletions
diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib
index 8009c99..173d877 100644
--- a/usr/src/lib/Makefile.lib
+++ b/usr/src/lib/Makefile.lib
@@ -55,6 +55,8 @@ SRCDIR =	..
 MAPFILEDIR =	$(SRCDIR)
 MAPFILES =	$(MAPFILEDIR)/mapfile-vers
 
+PCLIBDIR=/usr/lib/xorg
+
 #
 # If HDRDIR is left unset, then it's possible for the $(ROOTHDRDIR)/%
 # install rule in lib/Makefile.targ to generate false matches if there
diff --git a/usr/src/lib/Makefile.lib.64 b/usr/src/lib/Makefile.lib.64
index 7d3b977..ab7245a 100644
--- a/usr/src/lib/Makefile.lib.64
+++ b/usr/src/lib/Makefile.lib.64
@@ -30,6 +30,8 @@
 #
 include	$(SRC)/Makefile.master.64
 
+PCLIBDIR=/usr/lib/xorg/$(MACH64)
+
 #
 # Target Architecture
 #
diff --git a/usr/src/lib/libdrm/Makefile b/usr/src/lib/libdrm/Makefile
index 3863fff..04621c3 100644
--- a/usr/src/lib/libdrm/Makefile
+++ b/usr/src/lib/libdrm/Makefile
@@ -62,7 +62,7 @@ DRM_HDRS= \
 	via_drm.h \
 	vmwgfx_drm.h
 
-ROOT_DRM_HDRS=	$(DRM_HDRS:%=$(ROOTHDRDIR)/libdrm/%)
+ROOT_DRM_HDRS=	$(DRM_HDRS:%=$(ROOTHDRDIR)/drm/%)
 
 .KEEP_STATE:
 
@@ -70,13 +70,16 @@ install: all .WAIT $(SUBDIRS)
 
 all clean clobber lint: $(SUBDIRS)
 
-install_h: $(ROOTHDRS) $(ROOT_DRM_HDRS)
+install_h: $(ROOTHDRS) $(ROOT_DRM_HDRS) $(ROOTHDRDIR)/libdrm
 
 # need to mkdir...
-$(ROOT_DRM_HDRS) : $(ROOTHDRDIR)/libdrm
-$(ROOTHDRDIR)/libdrm :
+$(ROOT_DRM_HDRS) : $(ROOTHDRDIR)/drm
+$(ROOTHDRDIR)/drm :
 	$(INS.dir) $@
 
+$(ROOTHDRDIR)/libdrm: FRC
+	$(RM) -r $@; $(LN) -s drm $@
+
 check:	$(CHECKHDRS)
 
 _msg: # no msgfiles here
@@ -84,7 +87,7 @@ _msg: # no msgfiles here
 $(POFILE):      pofile_MSGFILES
 
 # install rules for install_h target
-$(ROOTHDRDIR)/libdrm/%: $(LIBDRM_CMN_DIR)/include/drm/%
+$(ROOTHDRDIR)/drm/%: $(LIBDRM_CMN_DIR)/include/drm/%
 	$(INS.file)
 
 # HDRS=...
diff --git a/usr/src/lib/libdrm/Makefile.pc b/usr/src/lib/libdrm/Makefile.pc
index a01589c..c628995 100644
--- a/usr/src/lib/libdrm/Makefile.pc
+++ b/usr/src/lib/libdrm/Makefile.pc
@@ -21,9 +21,6 @@ ROOTPCDIR64=	$(ROOT)/usr/lib/$(MACH64)/pkgconfig
 ROOTPCS=	$(PCS:%=$(ROOTPCDIR)/%)
 ROOTPCS64=	$(PCS:%=$(ROOTPCDIR64)/%)
 
-PCLIBDIR=/usr/lib/xorg
-$(BUILD64)PCLIBDIR=/usr/lib/xorg/$(MACH64)
-
 # Need ${prefix} as a literal
 PREFIX=$$\{prefix\}
 
diff --git a/usr/src/lib/libdrm_amdgpu/Makefile b/usr/src/lib/libdrm_amdgpu/Makefile
index 010a384..2eadd7c 100644
--- a/usr/src/lib/libdrm_amdgpu/Makefile
+++ b/usr/src/lib/libdrm_amdgpu/Makefile
@@ -39,7 +39,7 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
-ROOTHDRDIR=	$(ROOT)/usr/include/libdrm
+ROOTHDRDIR=	$(ROOT)/usr/include/drm
 
 HDRS= 	amdgpu.h
 
diff --git a/usr/src/lib/libdrm_intel/Makefile b/usr/src/lib/libdrm_intel/Makefile
index eef8079..00441d4 100644
--- a/usr/src/lib/libdrm_intel/Makefile
+++ b/usr/src/lib/libdrm_intel/Makefile
@@ -39,7 +39,7 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
-ROOTHDRDIR=	$(ROOT)/usr/include/libdrm
+ROOTHDRDIR=	$(ROOT)/usr/include/drm
 
 HDRS= \
 	intel_aub.h \
diff --git a/usr/src/lib/libdrm_radeon/Makefile b/usr/src/lib/libdrm_radeon/Makefile
index c8ee855..a0b686e 100644
--- a/usr/src/lib/libdrm_radeon/Makefile
+++ b/usr/src/lib/libdrm_radeon/Makefile
@@ -39,7 +39,7 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
-ROOTHDRDIR=	$(ROOT)/usr/include/libdrm
+ROOTHDRDIR=	$(ROOT)/usr/include/drm
 
 HDRS= \
 	r600_pci_ids.h \
diff --git a/usr/src/lib/libdrm_tegra/Makefile b/usr/src/lib/libdrm_tegra/Makefile
index e690481..ae277b6 100644
--- a/usr/src/lib/libdrm_tegra/Makefile
+++ b/usr/src/lib/libdrm_tegra/Makefile
@@ -39,7 +39,7 @@ clobber :=	TARGET= clobber
 install :=	TARGET= install
 lint :=		TARGET= lint
 
-ROOTHDRDIR=	$(ROOT)/usr/include/libdrm
+ROOTHDRDIR=	$(ROOT)/usr/include/drm
 
 HDRS= 	tegra.h