From: Ilya Leoshkevich <iii@linux.ibm.com>
Date: Mon, 11 Oct 2021 11:12:42 +0000 (+0200)
Subject: IBM Z: Fix building outside of a source directory
X-Git-Tag: 2.1.0-beta1~505
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ba6642b9867cb5208f519011f10b79a61e44fa2;p=thirdparty%2Fzlib-ng.git

IBM Z: Fix building outside of a source directory

Do not use relative includes, since they are valid only within the
source directory. Rely on the build system to pass the necessary
include flags instead.
---

diff --git a/arch/s390/crc32-vx.c b/arch/s390/crc32-vx.c
index bb23289cd..18b8bb223 100644
--- a/arch/s390/crc32-vx.c
+++ b/arch/s390/crc32-vx.c
@@ -12,8 +12,8 @@
  * relicensed under the zlib license.
  */
 
-#include "../../zutil.h"
-#include "../../crc32_p.h"
+#include "zutil.h"
+#include "crc32_p.h"
 
 #include <vecintrin.h>
 
diff --git a/arch/s390/dfltcc_common.c b/arch/s390/dfltcc_common.c
index c82c3b220..f1ae904ad 100644
--- a/arch/s390/dfltcc_common.c
+++ b/arch/s390/dfltcc_common.c
@@ -1,6 +1,6 @@
 /* dfltcc_deflate.c - IBM Z DEFLATE CONVERSION CALL general support. */
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "dfltcc_common.h"
 #include "dfltcc_detail.h"
 
diff --git a/arch/s390/dfltcc_common.h b/arch/s390/dfltcc_common.h
index 5c3be91b9..f46f9cafb 100644
--- a/arch/s390/dfltcc_common.h
+++ b/arch/s390/dfltcc_common.h
@@ -2,11 +2,11 @@
 #define DFLTCC_COMMON_H
 
 #ifdef ZLIB_COMPAT
-#include "../../zlib.h"
+#include "zlib.h"
 #else
-#include "../../zlib-ng.h"
+#include "zlib-ng.h"
 #endif
-#include "../../zutil.h"
+#include "zutil.h"
 
 void Z_INTERNAL *dfltcc_alloc_state(PREFIX3(streamp) strm, uInt items, uInt size);
 void Z_INTERNAL dfltcc_copy_state(void *dst, const void *src, uInt size);
diff --git a/arch/s390/dfltcc_deflate.c b/arch/s390/dfltcc_deflate.c
index 187865667..e3b53ee13 100644
--- a/arch/s390/dfltcc_deflate.c
+++ b/arch/s390/dfltcc_deflate.c
@@ -13,10 +13,10 @@
         $ make
 */
 
-#include "../../zbuild.h"
-#include "../../zutil.h"
-#include "../../deflate.h"
-#include "../../trees_emit.h"
+#include "zbuild.h"
+#include "zutil.h"
+#include "deflate.h"
+#include "trees_emit.h"
 #include "dfltcc_deflate.h"
 #include "dfltcc_detail.h"
 
diff --git a/arch/s390/dfltcc_inflate.c b/arch/s390/dfltcc_inflate.c
index f6a7e8f86..253506466 100644
--- a/arch/s390/dfltcc_inflate.c
+++ b/arch/s390/dfltcc_inflate.c
@@ -13,10 +13,10 @@
         $ make
 */
 
-#include "../../zbuild.h"
-#include "../../zutil.h"
-#include "../../inftrees.h"
-#include "../../inflate.h"
+#include "zbuild.h"
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
 #include "dfltcc_inflate.h"
 #include "dfltcc_detail.h"
 
diff --git a/arch/s390/s390.c b/arch/s390/s390.c
index 6dd5252ce..a67bfc249 100644
--- a/arch/s390/s390.c
+++ b/arch/s390/s390.c
@@ -1,4 +1,4 @@
-#include "../../zutil.h"
+#include "zutil.h"
 #include "s390.h"
 
 #include <sys/auxv.h>
diff --git a/arch/s390/s390.h b/arch/s390/s390.h
index dec035b3d..453c58137 100644
--- a/arch/s390/s390.h
+++ b/arch/s390/s390.h
@@ -1,7 +1,7 @@
 #ifndef S390_H_
 #define S390_H_
 
-#include "../../zutil.h"
+#include "zutil.h"
 
 extern int s390_cpu_has_vx;