From 2f3ec778bd8e534b05016f7090497869b5f5735c Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Tue, 29 Nov 2016 13:29:19 -0800
Subject: [PATCH] For distro build don't install options.h (conflicts with
 multi-arch). Fix for BUILD_DISTRO excludes with indent.

---
 Makefile.am        | 37 ++++++++++++++++++-------------------
 cyassl/include.am  |  8 +++++++-
 wolfssl/include.am |  8 +++++++-
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a9b7a5e28..1f042dc3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,25 +101,24 @@ include tests/include.am
 include sslSniffer/sslSnifferTest/include.am
 include rpm/include.am
 
-if BUILD_DISTRO
-    # Exclude references to non-DFSG sources from build files
-else
-    include mqx/util_lib/Sources/include.am
-    include mqx/wolfcrypt_benchmark/Sources/include.am
-    include mqx/wolfcrypt_test/Sources/include.am
-    include mqx/wolfssl/include.am
-    include mqx/wolfssl_client/Sources/include.am
-    include mplabx/include.am
-    include mplabx/wolfcrypt_benchmark.X/nbproject/include.am
-    include mplabx/wolfcrypt_test.X/nbproject/include.am
-    include mplabx/wolfssl.X/nbproject/include.am
-    include mcapi/include.am
-    include mcapi/wolfcrypt_mcapi.X/nbproject/include.am
-    include mcapi/wolfcrypt_test.X/nbproject/include.am
-    include mcapi/wolfssl.X/nbproject/include.am
-    include mcapi/zlib.X/nbproject/include.am
-    include tirtos/include.am
-    include IDE/include.am
+# Exclude references to non-DFSG sources from build files
+if !BUILD_DISTRO
+include mqx/util_lib/Sources/include.am
+include mqx/wolfcrypt_benchmark/Sources/include.am
+include mqx/wolfcrypt_test/Sources/include.am
+include mqx/wolfssl/include.am
+include mqx/wolfssl_client/Sources/include.am
+include mplabx/include.am
+include mplabx/wolfcrypt_benchmark.X/nbproject/include.am
+include mplabx/wolfcrypt_test.X/nbproject/include.am
+include mplabx/wolfssl.X/nbproject/include.am
+include mcapi/include.am
+include mcapi/wolfcrypt_mcapi.X/nbproject/include.am
+include mcapi/wolfcrypt_test.X/nbproject/include.am
+include mcapi/wolfssl.X/nbproject/include.am
+include mcapi/zlib.X/nbproject/include.am
+include tirtos/include.am
+include IDE/include.am
 endif
 include scripts/include.am
 
diff --git a/cyassl/include.am b/cyassl/include.am
index db1f089ee..b4c7e0436 100644
--- a/cyassl/include.am
+++ b/cyassl/include.am
@@ -16,10 +16,16 @@ nobase_include_HEADERS+= \
                          cyassl/certs_test.h \
                          cyassl/test.h \
                          cyassl/version.h \
-                         cyassl/options.h \
                          cyassl/ocsp.h \
                          cyassl/crl.h
 
 noinst_HEADERS+= \
                          cyassl/internal.h
 
+# For distro build don't install options.h.
+# It depends on the architecture and conflicts with Multi-Arch.
+if BUILD_DISTRO
+noinst_HEADERS+=         cyassl/options.h
+else
+nobase_include_HEADERS+= cyassl/options.h
+endif
diff --git a/wolfssl/include.am b/wolfssl/include.am
index a02488fc8..03883b086 100644
--- a/wolfssl/include.am
+++ b/wolfssl/include.am
@@ -16,10 +16,16 @@ nobase_include_HEADERS+= \
                          wolfssl/certs_test.h \
                          wolfssl/test.h \
                          wolfssl/version.h \
-                         wolfssl/options.h \
                          wolfssl/ocsp.h \
                          wolfssl/crl.h
 
 noinst_HEADERS+= \
                          wolfssl/internal.h
 
+# For distro build don't install options.h.
+# It depends on the architecture and conflicts with Multi-Arch.
+if BUILD_DISTRO
+noinst_HEADERS+=         wolfssl/options.h
+else
+nobase_include_HEADERS+= wolfssl/options.h
+endif