aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rw-r--r--contrib/minizip/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index b584073..acda3b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -360,7 +360,7 @@ zconf: $(SRCDIR)zconf.h.in
360 cp -p $(SRCDIR)zconf.h.in zconf.h 360 cp -p $(SRCDIR)zconf.h.in zconf.h
361 361
362minizip-test: static 362minizip-test: static
363 cd contrib/minizip && { CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; } 363 cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
364 364
365minizip-clean: 365minizip-clean:
366 cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; } 366 cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; }
diff --git a/contrib/minizip/Makefile b/contrib/minizip/Makefile
index aac76e0..3d927ec 100644
--- a/contrib/minizip/Makefile
+++ b/contrib/minizip/Makefile
@@ -1,4 +1,4 @@
1CC=cc 1CC?=cc
2CFLAGS := $(CFLAGS) -O -I../.. 2CFLAGS := $(CFLAGS) -O -I../..
3 3
4UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a 4UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a