[Xorg-commit] xc/config/cf Imake.tmpl,1.1.4.3,1.1.4.3.2.1

[Alexander Gottwald]

Committed by: ago

Update of /cvs/xorg/xc/config/cf
In directory pdx:/tmp/cvs-serv3247/cf

Modified Files:
      Tag: CYGWIN
	Imake.tmpl 
Log Message:
Import changes from xoncygwin

Index: Imake.tmpl
===================================================================
RCS file: /cvs/xorg/xc/config/cf/Imake.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.3.2.1
diff -u -d -r1.1.4.3 -r1.1.4.3.2.1
--- Imake.tmpl	30 Nov 2003 16:46:49 -0000	1.1.4.3
+++ Imake.tmpl	11 Dec 2003 19:34:33 -0000	1.1.4.3.2.1
@@ -2075,11 +2075,11 @@
 #endif
 #include LocalTmplFile
 
-#if !BuildLibraries && AlternateIncRoot
+#if !BuildLibraries && AlternateIncRoot && !defined(CrossCompileDir)
 INSTALLED_INCLUDES = -I$(INCROOT)
 #endif
 
-#if !defined(UseInstalled) && !BuildLibraries && AlternateUsrLibDir
+#if !defined(UseInstalled) && !BuildLibraries && AlternateUsrLibDir && !defined(CrossCompileDir)
 INSTALLED_LIBS = -L$(USRLIBDIR)
 #endif