aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-07-22 13:57:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-07-22 13:57:48 +0200
commit19a0faf4316a89e0a4ced32b8d3ea4b4ba9c3b18 (patch)
treed7185f95d41f2bf9434978d0efd9c063a3bb9cc7
parent8ba873ae5481743c8588c00d2852e7595d727097 (diff)
Make uname execution more robust
Mac OS X doesn't recognize the -o option
-rw-r--r--dist/examples/cxx/tree/custom/comments/makefile2
-rw-r--r--dist/examples/cxx/tree/custom/contacts/makefile2
-rw-r--r--dist/examples/cxx/tree/custom/mixed/makefile2
-rw-r--r--dist/examples/cxx/tree/custom/wildcard/makefile2
4 files changed, 4 insertions, 4 deletions
diff --git a/dist/examples/cxx/tree/custom/comments/makefile b/dist/examples/cxx/tree/custom/comments/makefile
index 4c231c6..442ab86 100644
--- a/dist/examples/cxx/tree/custom/comments/makefile
+++ b/dist/examples/cxx/tree/custom/comments/makefile
@@ -24,7 +24,7 @@ people.cxx people.ixx people.hxx: people.xsd
XML_SCHEMA_XSDFLAGS := --generate-xml-schema --generate-serialization \
--hxx-epilogue '\#include "xml-schema-custom.hxx"'
-ifneq ($(shell uname -o),Msys)
+ifneq ($(shell uname -o 2>&1),Msys)
XML_SCHEMA_XSDFLAGS += --custom-type anyType=/type_base
else
# Prevent MSYS from converting / to Windows path.
diff --git a/dist/examples/cxx/tree/custom/contacts/makefile b/dist/examples/cxx/tree/custom/contacts/makefile
index 845f6c3..37f895a 100644
--- a/dist/examples/cxx/tree/custom/contacts/makefile
+++ b/dist/examples/cxx/tree/custom/contacts/makefile
@@ -7,7 +7,7 @@ include $(root)/build/xsd/tree-rules.make
override XSDFLAGS += --generate-inline \
--hxx-epilogue '\#include "contacts-custom.hxx"'
-ifneq ($(shell uname -o),Msys)
+ifneq ($(shell uname -o 2>&1),Msys)
override XSDFLAGS += --custom-type contact=/contact_base
else
# Prevent MSYS from converting / to Windows path.
diff --git a/dist/examples/cxx/tree/custom/mixed/makefile b/dist/examples/cxx/tree/custom/mixed/makefile
index c5dac63..9c7974d 100644
--- a/dist/examples/cxx/tree/custom/mixed/makefile
+++ b/dist/examples/cxx/tree/custom/mixed/makefile
@@ -7,7 +7,7 @@ include $(root)/build/xsd/tree-rules.make
override XSDFLAGS += --generate-inline --generate-serialization \
--hxx-epilogue '\#include "people-custom.hxx"'
-ifneq ($(shell uname -o),Msys)
+ifneq ($(shell uname -o 2>&1),Msys)
override XSDFLAGS += --custom-type bio=/bio_base
else
# Prevent MSYS from converting / to Windows path.
diff --git a/dist/examples/cxx/tree/custom/wildcard/makefile b/dist/examples/cxx/tree/custom/wildcard/makefile
index f7561a2..7473f00 100644
--- a/dist/examples/cxx/tree/custom/wildcard/makefile
+++ b/dist/examples/cxx/tree/custom/wildcard/makefile
@@ -7,7 +7,7 @@ include $(root)/build/xsd/tree-rules.make
override XSDFLAGS += --generate-inline --generate-ostream \
--generate-serialization --hxx-epilogue '\#include "wildcard-custom.hxx"'
-ifneq ($(shell uname -o),Msys)
+ifneq ($(shell uname -o 2>&1),Msys)
override XSDFLAGS += --custom-type data=/data_base
else
# Prevent MSYS from converting / to Windows path.