From: Mika Lindqvist <postmaster@raasu.org>
Date: Sat, 21 Jan 2023 23:04:55 +0000 (+0200)
Subject: Fix building resource files during out-of-tree build with configure
X-Git-Tag: 2.1.0-beta1~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cb12dcf14826d1b8c75d0a68b5dce652e29ed24;p=thirdparty%2Fzlib-ng.git

Fix building resource files during out-of-tree build with configure
---

diff --git a/Makefile.in b/Makefile.in
index 88d40cb6..aebd9a7b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -212,8 +212,8 @@ maketrees.o:
 makecrct.o:
 	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/tools/makecrct.c
 
-zlibrc.o: win32/zlib$(SUFFIX)1.rc
-	$(RC) $(RCFLAGS) -o $@ win32/zlib$(SUFFIX)1.rc
+zlibrc.o: $(SRCDIR)/win32/zlib$(SUFFIX)1.rc
+	$(RC) $(RCFLAGS) -o $@ $(SRCDIR)/win32/zlib$(SUFFIX)1.rc
 
 .SUFFIXES: .lo
 
diff --git a/configure b/configure
index fa751b84..89b49a43 100755
--- a/configure
+++ b/configure
@@ -436,6 +436,7 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
           DEFFILE='win32/${LIBNAME2}.def'
         fi
         RC="${CROSS_PREFIX}windres"
+        RCFLAGS="-I ${BUILDDIR}"
         RCOBJS='zlibrc.o'
         STRIP="${CROSS_PREFIX}strip"
         EXE='.exe' ;;
@@ -460,6 +461,7 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
           DEFFILE='win32/${LIBNAME2}.def'
         fi
         RC="${CROSS_PREFIX}windres"
+        RCFLAGS="-I ${BUILDDIR}"
         RCOBJS='zlibrc.o'
         STRIP="${CROSS_PREFIX}strip"
         EXE='.exe' ;;
@@ -481,6 +483,7 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
           DEFFILE='win32/${LIBNAME2}.def'
         fi
         RC="${CROSS_PREFIX}windres"
+        RCFLAGS="-I ${BUILDDIR}"
         if [ "$CC" == "mingw32-gcc" ]; then
           case $ARCH in
           i386 | i486 | i586 | i686) RCFLAGS="${RCFLAGS} -F pe-i386";;