Revert botched checkin.

diff --git a/Makefile.in b/Makefile.in
index e3cc4a1b96e1429a0603b521c1fead9331584a9d..0b3bfdf8bf639fbbdbadb4e2afa6b05b0fda4352 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,15 +44,14 @@ OBJCOPY             := @OBJCOPY@
 
 include $(srcdir)/../Makefile.common
 
-MINGW_INCLUDES :=-I. -I$(srcdir) -I$(mingw_source)/include $(w32api_include) \
-                 -I$(updir)/bz2lib -I$(updir)/zlib
+MINGW_INCLUDES := -I. -I$(srcdir) -I$(mingw_source)/include $(w32api_include) -I$(updir)/bz2lib
 
 MINGW_CXXFLAGS := -MMD $(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
 MINGW_CFLAGS   := -MMD $(CFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows
 
-ZLIB           := $(bupdir)/zlib/libzcygw.a
+ZLIB           := zlib/libzcygw.a
 BZ2LIB         := $(bupdir)/bz2lib/libbz2.a
-libmingw32     := $(mingw_build)/libmingw32.a
+libmingw32.a   := $(mingw_build)/libmingw32.a
 libuser32      := $(w32api_lib)/libuser32.a
 libkernel32    := $(w32api_lib)/libkernel32.a
 
@@ -142,6 +141,7 @@ endif
 
 clean:
        rm -f *.o $(PROGS) iniparse.c* iniparse.h* inilex.c* *.d
+       $(MAKE) -C zlib clean
 
 realclean: clean
        rm -f  Makefile config.cache
@@ -156,7 +156,7 @@ install: all
 $(libmingw32): $(mingw_build)/Makefile
        @$(MAKE) -C $(@D) $(@F)
 
-$(ZLIB): $(bupdir)/zlib/Makefile
+$(ZLIB): zlib/Makefile
        $(MAKE) -C $(@D) $(@F) CC="$(CC)" CFLAGS='$(MINGW_CFLAGS)'
 
 $(BZ2LIB): $(bupdir)/bz2lib/Makefile

diff --git a/install.cc b/install.cc
index 936ed7df5f8275aab2b18801dfbd5385bc6280f0..96b0c4da483cae4e751a6cd42ed2ffca2b5c49e7 100644 (file)
--- a/install.cc
+++ b/install.cc
@@ -30,7 +30,7 @@ static char *cvsid = "\n%%% $Id$\n";
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include "zlib.h"
+#include "zlib/zlib.h"
 
 #include "resource.h"
 #include "ini.h"

diff --git a/tar.cc b/tar.cc
index 40eaeac597d0b10ad22da895b281aa6e456449f5..7d16a84e4a1fdb32a95ae754cdc682a96bce524c 100644 (file)
--- a/tar.cc
+++ b/tar.cc
@@ -23,7 +23,7 @@ static char *cvsid = "\n%%% $Id$\n";
 #include <sys/types.h>
 #include <sys/fcntl.h>
 
-#include "zlib.h"
+#include "zlib/zlib.h"
 #include "tar.h"
 #include "mkdir.h"
 #include "log.h"