From 7dcd55800b587a1e12dd8b6cb9209dfe38be32e3 Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Thu, 20 Apr 1995 15:24:54 +0000
Subject: [PATCH] *** empty log message ***

---
 Makefile        |    3 ++-
 kernel/Makefile |   15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ed12eb4..e75edea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 # Top level Makefile for Email gateway.
 # Europagate, 1994-1995.
 #
-# $Id: Makefile,v 1.20 1995/04/17 09:31:02 adam Exp $
+# $Id: Makefile,v 1.21 1995/04/20 15:24:54 quinn Exp $
 #
 SHELL=/bin/sh
 MAKE=make
 SUBDIR=res+log util ccl fml zlayer kernel
 CFLAGS=-Wall -g -pedantic -ansi 
+#CC=checkergcc
 CPP=$(CC) -E
 
 # GNU regex package location
diff --git a/kernel/Makefile b/kernel/Makefile
index 7964ac1..3b07766 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -2,7 +2,10 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.19  1995/04/19 16:08:20  adam
+# Revision 1.20  1995/04/20 15:24:59  quinn
+# *** empty log message ***
+#
+# Revision 1.19  1995/04/19  16:08:20  adam
 # Minor changes.
 #
 # Revision 1.18  1995/04/19  16:01:57  adam
@@ -66,11 +69,21 @@
 #
 SHELL=/bin/sh
 
+<<<<<<< 1.19
+ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
+ZINC=-I$(ZPRE)
+ZLIB=$(ZPRE)/libz3950.a
+=======
 #ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
 #ZINC=-I$(ZPRE)
 #ZLIB=$(ZPRE)/libz3950.a
+>>>>>>> /tmp/T4a18061
 
+<<<<<<< 1.19
+#ZLIB=../../yaz/lib/libyaz.a
+=======
 ZLIB=../../yaz/lib/libyaz.a
+>>>>>>> /tmp/T4a18061
 
 INCLUDE=-I../include
 #CFLAGS=-g -Wall 
-- 
1.7.10.4