From 60f7efb5d452e1120dffb4b413bc4773ea225899 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Sun, 4 Oct 2020 15:34:17 +0200
Subject: [PATCH] fix out-of-source builds for hfsutils

---
 build-toolchain.bash         | 5 ++---
 hfsutils/Makefile.in         | 8 ++++----
 hfsutils/libhfs/Makefile.in  | 4 ++--
 hfsutils/librsrc/Makefile.in | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build-toolchain.bash b/build-toolchain.bash
index e97fc450c7..c05685c5be 100755
--- a/build-toolchain.bash
+++ b/build-toolchain.bash
@@ -318,10 +318,9 @@ if [ $SKIP_THIRDPARTY != true ]; then
 	# Build hfsutil
 	mkdir -p $PREFIX/lib
 	mkdir -p $PREFIX/share/man/man1
-	rm -rf hfsutils
-	cp -r $SRC/hfsutils .
+	mkdir hfsutils
 	cd hfsutils
-	./configure --prefix=$PREFIX --mandir=$PREFIX/share/man --enable-devlibs
+	$SRC/hfsutils/configure --prefix=$PREFIX --mandir=$PREFIX/share/man --enable-devlibs
 	make
 	make install
 	cd ..
diff --git a/hfsutils/Makefile.in b/hfsutils/Makefile.in
index 90100b1771..e77f49e733 100644
--- a/hfsutils/Makefile.in
+++ b/hfsutils/Makefile.in
@@ -42,7 +42,7 @@ LIBINSTALL =	@INSTALL_DATA@
 HARDLINK =	ln -f
 
 CC =		@CC@
-INCLUDES =	@CPPFLAGS@ -Ilibhfs @TCL_INCLUDES@ @TK_INCLUDES@
+INCLUDES =	@CPPFLAGS@ -I${src}/libhfs -I. @TCL_INCLUDES@ @TK_INCLUDES@
 DEFINES =	@DEFS@
 LIBOBJS =	@LIBOBJS@
 LIBS =		@LIBS@
@@ -120,7 +120,7 @@ install_cli :: all_cli
 	rm -f "$(BINDEST)/$(HFSUTIL)"
 
 	for file in $(GENERALDOCS) $(CLIDOCS); do  \
-		$(LIBINSTALL) doc/man/$$file  \
+		$(LIBINSTALL) $(src)/doc/man/$$file  \
 		"$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)";  \
 	done
 
@@ -136,7 +136,7 @@ install_tcl :: all_tcl
 	fi
 
 	for file in $(TCLDOCS); do  \
-		$(LIBINSTALL) doc/man/$$file  \
+		$(LIBINSTALL) $(src)/doc/man/$$file  \
 		"$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)";  \
 	done
 
@@ -146,7 +146,7 @@ install_tk :: all_tk
 	done
 
 	for file in $(TKDOCS); do  \
-		$(LIBINSTALL) doc/man/$$file  \
+		$(LIBINSTALL) $(src)/doc/man/$$file  \
 		"$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)";  \
 	done
 
diff --git a/hfsutils/libhfs/Makefile.in b/hfsutils/libhfs/Makefile.in
index 5e847f1d52..71be85c4f2 100644
--- a/hfsutils/libhfs/Makefile.in
+++ b/hfsutils/libhfs/Makefile.in
@@ -40,7 +40,7 @@ SOFTLINK =	@LN_S@
 OS =		unix
 
 CC =		@CC@
-INCLUDES =	@CPPFLAGS@
+INCLUDES =	@CPPFLAGS@ -I.
 DEFINES =	@DEFS@
 LIBOBJS =	@LIBOBJS@
 LIBS =		@LIBS@
@@ -73,7 +73,7 @@ check :: all
 
 install ::
 	$(LIBINSTALL) libhfs.a "$(LIBDEST)/."
-	$(LIBINSTALL) hfs.h "$(INCDEST)/."
+	$(LIBINSTALL) $(src)/hfs.h "$(INCDEST)/."
 
 again :: clean all
 
diff --git a/hfsutils/librsrc/Makefile.in b/hfsutils/librsrc/Makefile.in
index dedf75bddf..d62edd2448 100644
--- a/hfsutils/librsrc/Makefile.in
+++ b/hfsutils/librsrc/Makefile.in
@@ -37,7 +37,7 @@ INSTALL =	@INSTALL@
 LIBINSTALL =	@INSTALL_DATA@
 
 CC =		@CC@
-INCLUDES =	@CPPFLAGS@
+INCLUDES =	@CPPFLAGS@ -I.
 DEFINES =	@DEFS@
 LIBOBJS =	@LIBOBJS@
 LIBS =		@LIBS@
@@ -69,7 +69,7 @@ check :: all
 
 install ::
 	$(LIBINSTALL) librsrc.a "$(LIBDEST)/."
-	$(LIBINSTALL) rsrc.h "$(INCDEST)/."
+	$(LIBINSTALL) $(src)/rsrc.h "$(INCDEST)/."
 
 again :: clean all