From: Daniel Axtens <dja@axtens.net>
Date: Fri, 8 May 2015 05:58:09 +0000 (+1000)
Subject: Unbreak things: import the right zconf.h
X-Git-Tag: 1.9.9-b1~859^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0587d872fa61ffa3b0bb5aea2f4a0087edb2f43;p=thirdparty%2Fzlib-ng.git

Unbreak things: import the right zconf.h

Previously I imported <zconf.h>. This worked on my box because I had a
system-wide zconf.h. It didn't work on Travis. This should fix that.

Signed-off-by: Daniel Axtens <dja@axtens.net>
---

diff --git a/Makefile.in b/Makefile.in
index 1ac99ddc7..a618d851c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -152,11 +152,11 @@ minigzip64.o: $(SRCDIR)/test/minigzip.c $(SRCDIR)/zlib.h zconf.h
 .SUFFIXES: .lo
 
 %.o: $(SRCDIR)/%.c
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(CC) -I. -I$(SRCDIR) $(CFLAGS) -c -o $@ $<
 
 %.lo: $(SRCDIR)/%.c
 	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
+	$(CC) -I. -I$(SRCDIR) $(SFLAGS) -DPIC -c -o objs/$*.o $<
 	-@mv objs/$*.o $@
 
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a