From 0f45e7d659c224862f9ae652464fbc66149f8491 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Wed, 11 Nov 2020 12:33:56 +0100
Subject: [PATCH] Add a gnuace verbatim section so that we can remove the
 specific xsc handling from the gnuace template in ACE

    * config/xscdefaults.mpb:
---
 config/xscdefaults.mpb | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/config/xscdefaults.mpb b/config/xscdefaults.mpb
index 70ce39d5e..f55dedc85 100644
--- a/config/xscdefaults.mpb
+++ b/config/xscdefaults.mpb
@@ -1,19 +1,25 @@
 // -*- MPC -*-
 project {
-        specific {
-          xsc_bin = $(XSC_ROOT)/bin/xsc
-          xsc_dep = $(XSC_ROOT)/bin/xsc
-          xsc_flags = --backend cxx
-        }
+  specific {
+    xsc_bin = $(XSC_ROOT)/bin/xsc
+    xsc_dep = $(XSC_ROOT)/bin/xsc
+    xsc_flags = --backend cxx
+  }
 
-        Define_Custom(XSC) {
-          automatic         = 0
-          dependent         = $(XSC_DEP)
-          command           = $(XSC_BIN)
-          commandflags      = $(XSC_FLAGS)
-          inputext          = .xsd
-          source_outputext  = .cpp
-          header_outputext  = .hpp
-          keyword xscflags  = commandflags
-        }
+  verbatim(gnuace,macros,1) {
+    XSC_BIN = $(XSC_ROOT)/bin/xsc
+    XSC_DEP = $(XSC_ROOT)/bin/xsc$(EXEEXT)
+    XSC_FLAGS = --backend cxx
+  }
+
+  Define_Custom(XSC) {
+    automatic         = 0
+    dependent         = $(XSC_DEP)
+    command           = $(XSC_BIN)
+    commandflags      = $(XSC_FLAGS)
+    inputext          = .xsd
+    source_outputext  = .cpp
+    header_outputext  = .hpp
+    keyword xscflags  = commandflags
+  }
 }