fix out-of-source builds for hfsutils

This commit is contained in:
Wolfgang Thaller 2020-10-04 15:34:17 +02:00
parent 5f4733ea5f
commit 60f7efb5d4
4 changed files with 10 additions and 11 deletions

View File

@ -318,10 +318,9 @@ if [ $SKIP_THIRDPARTY != true ]; then
# Build hfsutil # Build hfsutil
mkdir -p $PREFIX/lib mkdir -p $PREFIX/lib
mkdir -p $PREFIX/share/man/man1 mkdir -p $PREFIX/share/man/man1
rm -rf hfsutils mkdir hfsutils
cp -r $SRC/hfsutils .
cd 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
make install make install
cd .. cd ..

View File

@ -42,7 +42,7 @@ LIBINSTALL = @INSTALL_DATA@
HARDLINK = ln -f HARDLINK = ln -f
CC = @CC@ CC = @CC@
INCLUDES = @CPPFLAGS@ -Ilibhfs @TCL_INCLUDES@ @TK_INCLUDES@ INCLUDES = @CPPFLAGS@ -I${src}/libhfs -I. @TCL_INCLUDES@ @TK_INCLUDES@
DEFINES = @DEFS@ DEFINES = @DEFS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -120,7 +120,7 @@ install_cli :: all_cli
rm -f "$(BINDEST)/$(HFSUTIL)" rm -f "$(BINDEST)/$(HFSUTIL)"
for file in $(GENERALDOCS) $(CLIDOCS); do \ for file in $(GENERALDOCS) $(CLIDOCS); do \
$(LIBINSTALL) doc/man/$$file \ $(LIBINSTALL) $(src)/doc/man/$$file \
"$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)"; \ "$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)"; \
done done
@ -136,7 +136,7 @@ install_tcl :: all_tcl
fi fi
for file in $(TCLDOCS); do \ for file in $(TCLDOCS); do \
$(LIBINSTALL) doc/man/$$file \ $(LIBINSTALL) $(src)/doc/man/$$file \
"$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)"; \ "$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)"; \
done done
@ -146,7 +146,7 @@ install_tk :: all_tk
done done
for file in $(TKDOCS); do \ for file in $(TKDOCS); do \
$(LIBINSTALL) doc/man/$$file \ $(LIBINSTALL) $(src)/doc/man/$$file \
"$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)"; \ "$(MANDEST)/man$(MANEXT)/`basename $$file .1`.$(MANEXT)"; \
done done

View File

@ -40,7 +40,7 @@ SOFTLINK = @LN_S@
OS = unix OS = unix
CC = @CC@ CC = @CC@
INCLUDES = @CPPFLAGS@ INCLUDES = @CPPFLAGS@ -I.
DEFINES = @DEFS@ DEFINES = @DEFS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -73,7 +73,7 @@ check :: all
install :: install ::
$(LIBINSTALL) libhfs.a "$(LIBDEST)/." $(LIBINSTALL) libhfs.a "$(LIBDEST)/."
$(LIBINSTALL) hfs.h "$(INCDEST)/." $(LIBINSTALL) $(src)/hfs.h "$(INCDEST)/."
again :: clean all again :: clean all

View File

@ -37,7 +37,7 @@ INSTALL = @INSTALL@
LIBINSTALL = @INSTALL_DATA@ LIBINSTALL = @INSTALL_DATA@
CC = @CC@ CC = @CC@
INCLUDES = @CPPFLAGS@ INCLUDES = @CPPFLAGS@ -I.
DEFINES = @DEFS@ DEFINES = @DEFS@
LIBOBJS = @LIBOBJS@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -69,7 +69,7 @@ check :: all
install :: install ::
$(LIBINSTALL) librsrc.a "$(LIBDEST)/." $(LIBINSTALL) librsrc.a "$(LIBDEST)/."
$(LIBINSTALL) rsrc.h "$(INCDEST)/." $(LIBINSTALL) $(src)/rsrc.h "$(INCDEST)/."
again :: clean all again :: clean all