diff options
Diffstat (limited to 'lib/libmagic/Makefile')
| -rw-r--r-- | lib/libmagic/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 5f967102fe02..150ddc686241 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -1,4 +1,3 @@ -# $FreeBSD$ # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009 PACKAGE=lib${LIB} @@ -17,6 +16,7 @@ MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c buffer.c cdf.c cdf_time.c \ compress.c der.c encoding.c fsmagic.c funcs.c is_json.c \ is_csv.c \ + is_simh.c \ is_tar.c magic.c print.c readcdf.c readelf.c seccomp.c softmagic.c INCS= magic.h @@ -42,9 +42,9 @@ PACKAGE_VERSION!= sed -n '/define.*PACKAGE_VERSION/{s,[^0-9.],,gp;q;}' ${.CURDIR libmagic.pc: libmagic.pc.in sed -e 's,@prefix@,/usr,g ; \ s,@exec_prefix@,$${prefix},g ; \ - s,@libdir@,$${exec_prefix}/lib,g ; \ - s,@sharedlibdir@,$${libdir},g ; \ - s,@includedir@,$${prefix}/include,g ; \ + s,@libdir@,${LIBDIR},g ; \ + s,@sharedlibdir@,${SHLIBDIR},g ; \ + s,@includedir@,${INCLUDEDIR},g ; \ s,@VERSION@,${PACKAGE_VERSION},g ; \ s,@LIBS@,,g ;' \ ${.ALLSRC} > ${.TARGET} @@ -59,12 +59,13 @@ magic.mgc: magic CLEANFILES+= mkmagic DEPENDOBJS+= mkmagic build-tools: mkmagic +# For the non-dirdeps build, HOST_CC is CC by default mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META} - ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ + ${HOST_CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ ${.ALLSRC:N*.h:O:u} ${LDADD} .endif -.if ${MK_DIRDEPS_BUILD} == "yes" +.if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host" BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR} .else magic.mgc: mkmagic |