summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-04-17 16:55:35 -0700
committerMichael Forney <mforney@mforney.org>2016-04-17 16:55:35 -0700
commit20190e30ef5327c5a793598ecf21923ed5b4b658 (patch)
treed60f236b78ff44c5643260203f84bb2b61d8b152
parenta8b545ba2b29b7ad7f53c6d88655ac442bde6732 (diff)
file: Fix building with zlib
-rw-r--r--core/file/config.h1
-rw-r--r--core/file/gen.rc4
2 files changed, 3 insertions, 2 deletions
diff --git a/core/file/config.h b/core/file/config.h
index eaaeb8ac..3bc02f47 100644
--- a/core/file/config.h
+++ b/core/file/config.h
@@ -3,6 +3,7 @@
/* features */
#define BUILTIN_ELF 1
#define ELFCORE 1
+#define HAVE_LIBZ 1
#define HAVE_ZLIB_H 1
/* headers */
diff --git a/core/file/gen.rc b/core/file/gen.rc
index bd1368d8..b4029783 100644
--- a/core/file/gen.rc
+++ b/core/file/gen.rc
@@ -6,7 +6,7 @@ cflags\
-D_GNU_SOURCE\
-Wall\
-I include\
- -I core/zlib/include\
+ -I '$builddir'/core/zlib/include\
-I '$dir' \
-I '$outdir'/include
@@ -51,7 +51,7 @@ srcs=(\
ar libmagic.a $srcs.o
}
-exe file src/file.c libmagic.a
+exe file src/file.c libmagic.a '$builddir/core/zlib/libz.a'
file bin/file '$outdir'/file 755
file share/man/man1/file.1 '$outdir'/file.1 644