From ba5cf7a24e35aeaf48cbf6a680978c6cce3e1d25 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 16 Aug 2020 20:44:02 -0700
Subject: [PATCH] further disambiguate inclusion of colortbl.h

This generated header needs some extra acrobatics. Related to #1785.
---
 lib/common/CMakeLists.txt | 7 ++++---
 lib/common/colxlate.c     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index 5fee446c0..7e04133e6 100644
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -39,10 +39,11 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/generate_color_lib.cmake
 )
 add_custom_command(
-    OUTPUT colortbl.h
+    OUTPUT common/colortbl.h
     DEPENDS color_lib
+    COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/common"
     COMMAND ${AWK_EXECUTABLE} -f ${TOP_SOURCE_DIR}/awk/colortbl.awk
-            ${CMAKE_CURRENT_BINARY_DIR}/color_lib > ${CMAKE_CURRENT_BINARY_DIR}/colortbl.h
+            ${CMAKE_CURRENT_BINARY_DIR}/color_lib > ${CMAKE_CURRENT_BINARY_DIR}/common/colortbl.h
 )
 
 # Generate ps_font_equiv.h from sources
@@ -66,7 +67,7 @@ add_library(common STATIC
     arith.h
     color.h
     colorprocs.h
-    colortbl.h
+    ${CMAKE_CURRENT_BINARY_DIR}/common/colortbl.h
     const.h
     entities.h
     geom.h
diff --git a/lib/common/colxlate.c b/lib/common/colxlate.c
index 74e7169a1..429379e0a 100644
--- a/lib/common/colxlate.c
+++ b/lib/common/colxlate.c
@@ -25,7 +25,7 @@
 #include <common/arith.h>
 #include <common/color.h>
 #include <common/colorprocs.h>
-#include "colortbl.h"
+#include <common/colortbl.h>
 #include <common/memory.h>
 #include <cgraph/strcasecmp.h>
 
-- 
2.50.1