4 files changed, 9 insertions, 7 deletions
diff --git a/xc/include/GL/Imakefile b/xc/include/GL/Imakefile
index b88d1e6e1..7b9e9dbc0 100644
--- a/xc/include/GL/Imakefile
+++ b/xc/include/GL/Imakefile
@@ -1,5 +1,5 @@
 
-XCOMM $XFree86: xc/include/GL/Imakefile,v 1.8 2000/03/02 16:07:29 martin Exp $
+XCOMM $XFree86: xc/include/GL/Imakefile,v 1.9 2000/06/17 00:02:46 martin Exp $
 
 LinkSourceFile(gl.h, ../../extras/Mesa/include/GL)
 LinkSourceFile(glext.h, ../../extras/Mesa/include/GL)
diff --git a/xc/include/GL/glx.h b/xc/include/GL/glx.h
index e4712b95f..ac7284edc 100644
--- a/xc/include/GL/glx.h
+++ b/xc/include/GL/glx.h
@@ -1,6 +1,7 @@
 #ifndef __GLX_glx_h__
 #define __GLX_glx_h__
 
+/* $XFree86: xc/include/GL/glx.h,v 1.7 2000/06/30 18:27:00 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -37,7 +38,6 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/Xmd.h>
 #include <GL/gl.h>
 #include <GL/glxtokens.h>
 
diff --git a/xc/include/GL/glxtokens.h b/xc/include/GL/glxtokens.h
index 4efa20a71..8c4f2185a 100644
--- a/xc/include/GL/glxtokens.h
+++ b/xc/include/GL/glxtokens.h
@@ -1,6 +1,7 @@
 #ifndef __GLX_glxtokens_h__
 #define __GLX_glxtokens_h__
 
+/* $XFree86: xc/include/GL/glxtokens.h,v 1.4 2000/06/17 00:02:46 martin Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
diff --git a/xc/include/Imakefile b/xc/include/Imakefile
index fdff66e2b..20068e14b 100644
--- a/xc/include/Imakefile
+++ b/xc/include/Imakefile
@@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/93 1997/06/13 15:34:58 kaleb $
 
 
 
-XCOMM $XFree86: xc/include/Imakefile,v 3.19 2000/02/13 00:12:37 dawes Exp $
+XCOMM $XFree86: xc/include/Imakefile,v 3.24 2000/06/30 21:51:51 dawes Exp $
 #define IHaveSubdirs
 #define PassCDebugFlags /**/
 
@@ -70,10 +70,11 @@ InstallDriverSDKNonExecFile(Xosdefs.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(Xproto.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(Xprotostr.h,$(DRIVERSDKINCLUDEDIR))
 
-
 XCOMM For the Linux/OpenGL base standard
-#if LinkGLToUsrInclude
+#if LinkGLToUsrInclude && AlternateIncRoot
 install::
-	$(RM) /usr/include/GL
-	$(LN) $(INCDIR)/GL /usr/include/GL
+/*	-$(RM) $(SYSTEMUSRINCDIR)/GL */
+	@if [ ! -d $(SYSTEMUSRINCDIR)/GL ]; then \
+		set -x; $(LN) $(INCDIR)/GL $(SYSTEMUSRINCDIR)/GL; \
+	fi
 #endif