--- Makefile.orig 2019-05-30 20:27:31.000000000 -0600
+++ Makefile 2019-06-04 09:40:32.212192338 -0600
@@ -20,7 +20,7 @@ MODULES := \
src/map/mapper src/map/mio src/map/super src/map/if \
src/map/amap src/map/cov src/map/scl src/map/mpm \
src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
- src/misc/vec src/misc/hash src/misc/tim src/misc/bzlib src/misc/zlib \
+ src/misc/vec src/misc/hash src/misc/tim \
src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
@@ -42,6 +42,7 @@ $(ARCHFLAGS_EXE) : arch_flags.c
$(CC) arch_flags.c -o $(ARCHFLAGS_EXE)
INCLUDES += -I$(ABCSRC)/src
+LIBS=-lbz2 -lz
# Use C99 stdint.h header for platform-dependent types
ifdef ABC_USE_STDINT_H
--- src/base/io/ioReadAiger.c.orig 2019-05-30 20:27:31.000000000 -0600
+++ src/base/io/ioReadAiger.c 2019-06-04 09:40:32.231192003 -0600
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
-#include "misc/bzlib/bzlib.h"
-#include "misc/zlib/zlib.h"
+#include <bzlib.h>
+#include <zlib.h>
#include "ioAbc.h"
ABC_NAMESPACE_IMPL_START
--- src/base/io/ioReadBlifMv.c.orig 2019-05-30 20:27:31.000000000 -0600
+++ src/base/io/ioReadBlifMv.c 2019-06-04 09:40:32.232191985 -0600
@@ -18,8 +18,8 @@
***********************************************************************/
-#include "misc/zlib/zlib.h"
-#include "misc/bzlib/bzlib.h"
+#include <zlib.h>
+#include <bzlib.h>
#include "base/abc/abc.h"
#include "misc/vec/vecPtr.h"
#include "ioAbc.h"
--- src/base/io/ioWriteAiger.c.orig 2019-05-30 20:27:31.000000000 -0600
+++ src/base/io/ioWriteAiger.c 2019-06-04 09:40:32.233191967 -0600
@@ -26,8 +26,8 @@
#include <string.h>
#include <assert.h>
-#include "misc/bzlib/bzlib.h"
-#include "misc/zlib/zlib.h"
+#include <bzlib.h>
+#include <zlib.h>
#include "ioAbc.h"
--- src/sat/bsat2/MainSat.cpp.orig 2019-05-30 20:27:31.000000000 -0600
+++ src/sat/bsat2/MainSat.cpp 2019-06-04 09:40:32.234191950 -0600
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <errno.h>
#include <signal.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
#include "System.h"
#include "ParseUtils.h"
--- src/sat/bsat2/MainSimp.cpp.orig 2019-05-30 20:27:31.000000000 -0600
+++ src/sat/bsat2/MainSimp.cpp 2019-06-04 09:40:32.234191950 -0600
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <errno.h>
#include <signal.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
#ifndef _WIN32
#include <sys/resource.h>
--- src/sat/bsat2/ParseUtils.h.orig 2019-05-30 20:27:31.000000000 -0600
+++ src/sat/bsat2/ParseUtils.h 2019-06-04 09:40:32.235191932 -0600
@@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <stdlib.h>
#include <stdio.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
namespace Minisat {
--- src/sat/cnf/cnfMan.c.orig 2019-05-30 20:27:31.000000000 -0600
+++ src/sat/cnf/cnfMan.c 2019-06-04 09:40:32.235191932 -0600
@@ -21,7 +21,7 @@
#include "cnf.h"
#include "sat/bsat/satSolver.h"
#include "sat/bsat/satSolver2.h"
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
ABC_NAMESPACE_IMPL_START
--- src/sat/glucose/ParseUtils.h.orig 2019-05-30 20:27:31.000000000 -0600
+++ src/sat/glucose/ParseUtils.h 2019-06-04 09:40:32.236191914 -0600
@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <stdio.h>
#include <math.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
ABC_NAMESPACE_CXX_HEADER_START
--- src/sat/glucose2/ParseUtils.h.orig
+++ src/sat/glucose2/ParseUtils.h
@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
#include <stdio.h>
#include <math.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
ABC_NAMESPACE_CXX_HEADER_START