]> granicus.if.org Git - file/commitdiff
PR/485: Use ${FILE_COMPILE} when cross-compiling to test for file version.
authorChristos Zoulas <christos@zoulas.com>
Tue, 2 Feb 2016 21:30:47 +0000 (21:30 +0000)
committerChristos Zoulas <christos@zoulas.com>
Tue, 2 Feb 2016 21:30:47 +0000 (21:30 +0000)
This might break cross-compiling to a different architecture.

magic/Makefile.am

index d94e99d6480e18fed9b69a5ba711a69dd18f998c..9c1538f1150d44074919819fcf03d7a2d9d9d01e 100644 (file)
@@ -1,5 +1,5 @@
 #
-# $File: Makefile.am,v 1.107 2015/11/23 22:04:36 christos Exp $
+# $File: Makefile.am,v 1.108 2016/01/19 15:08:14 christos Exp $
 #
 MAGIC_FRAGMENT_BASE = Magdir
 MAGIC_DIR = $(top_srcdir)/magic
@@ -296,7 +296,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
        @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
            echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
          else \
-           v=$$(file --version | sed -e s/file-// -e q); \
+           v=$$(${FILE_COMPILE} --version | sed -e s/file-// -e q); \
            if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
                echo "Cannot use the installed version of file ($$v) to"; \
                echo "cross-compile file ${PACKAGE_VERSION}"; \