Hey Jon, I see that you've started working on this a bit.

I had a look at your commits (as I also have an interest in this space),
and I'm watching this hardcoded line grow:
---
INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 
-I/usr/X11R6/include/X11 -I../../imports/x11/include/X11
---


Might you consider this insted?
---
INCLUDES = -I../../include -I/$(XPROJECTROOT)/include/X11 
-I../../imports/x11/include/X11
---


Patch attached.  Test it of course on your available systems, but it
should work well.  It's essentially what you're trying to accomplish
here.

I think there's actually a more correct way to do this in X11.tmpl and
friends, but I took the conservative route for the moment.  Some day, I
want to sit down, have a long hard look at that config/cf directory,
and clean up a lot of what we're doing.  It's my feeling that there's a
shiny, smart config system buried under years of grime, just begging to
be let out =)


-mrt

>From 9e6f486473e59796d07e82fd58feefb73ee1bb18 Mon Sep 17 00:00:00 2001
From: "Matthew R. Trower" <d...@blackshard.net>
Date: Fri, 15 Jun 2018 21:34:43 -0500
Subject: [PATCH] Condense templated X11 includes

---
 cde/config/imake/Makefile.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cde/config/imake/Makefile.ini b/cde/config/imake/Makefile.ini
index f05a17de..b48c9a07 100644
--- a/cde/config/imake/Makefile.ini
+++ b/cde/config/imake/Makefile.ini
@@ -11,7 +11,7 @@
 BOOTSTRAPCFLAGS = 
 CC = cc
 CDEBUGFLAGS = -O
-INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I../../imports/x11/include/X11
+INCLUDES = -I../../include -I/$(XPROJECTROOT)/include/X11 -I../../imports/x11/include/X11
 CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
 SHELL = /bin/sh
 RM = rm -f
-- 
2.16.2

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel

Reply via email to