From 8b58c92450692dd050a8200742d04f55e336ae53 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 23 Feb 1995 10:07:53 +0000
Subject: [PATCH] Minor changes.

---
 Makefile        |   17 ++++++++++++-----
 zlayer/Makefile |   13 ++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 8be66b3..1e054a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Top level Makefile for Email gateway.
 # Europagate, 1994-1995.
 #
-# $Id: Makefile,v 1.14 1995/02/22 21:25:08 adam Exp $
+# $Id: Makefile,v 1.15 1995/02/23 10:07:53 adam Exp $
 #
 SHELL=/bin/sh
 MAKE=make
@@ -9,14 +9,21 @@ SUBDIR=res+log util fml ccl zlayer kernel
 CFLAGS=-Wall -g -pedantic -ansi 
 #CC=gcc
 CPP=$(CC) -E
-ZPRE=/usr/local/emailgw/src/zdist102b1-1/libz3950
-NETLIB=-lnsl -lsocket
+
+# For sun-sparc-solaris 
+#ZPRE=/usr/local/emailgw/src/zdist102b1-1/libz3950
+#ZDEFS=-DHIGH_TO_LOW -Dfar=
+#NETLIB=-lnsl -lsocket
+
+# For linux
+ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
+ZDEFS=-DLOW_TO_HIGH -Dfar=
 
 all:
-	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZPRE="$(ZPRE)" CPP="$(CPP)" NETLIB="$(NETLIB)"; then cd ..; else exit 1; fi; done
+	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZPRE="$(ZPRE)" CPP="$(CPP)" NETLIB="$(NETLIB)" ZDEFS="$(ZDEFS)"; then cd ..; else exit 1; fi; done
 
 dep depend:
-	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZPRE="$(ZPRE)" CPP="$(CPP)" depend; then cd ..; else exit 1; fi; done
+	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZPRE="$(ZPRE)" CPP="$(CPP)" ZDEFS="$(ZDEFS)" depend; then cd ..; else exit 1; fi; done
 
 clean:
 	-rm -f lib/*.a
diff --git a/zlayer/Makefile b/zlayer/Makefile
index 07674e1..8096f70 100644
--- a/zlayer/Makefile
+++ b/zlayer/Makefile
@@ -2,7 +2,10 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.5  1995/02/23 08:32:25  adam
+# Revision 1.6  1995/02/23 10:09:39  adam
+# Minor changes.
+#
+# Revision 1.5  1995/02/23  08:32:25  adam
 # Changed header.
 #
 # Revision 1.3  1995/02/22  08:51:49  adam
@@ -14,12 +17,13 @@
 # Revision 1.1  1995/02/16  14:47:55  quinn
 # First kick.
 #
+SHELL=/bin/sh
 
+ZDEFS=-DLOW_TO_HIGH -Dfar=
 ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
 ZINC=-I$(ZPRE)
 ZLIB=$(ZPRE)/libz3950.a
 
-SHELL=/bin/sh
 INCLUDE=-I. -I../include $(ZINC)
 CFLAGS=-g -Wall -pedantic -ansi
 TPROG1=test
@@ -27,7 +31,6 @@ LIB=../lib/libzass.a
 PO=zaccess.o
 CPP=$(CC) -E
 DEFS=$(INCLUDE)
-ZDEFS=-DHIGH_TO_LOW -Dfar=
 
 all: $(LIB)
 
@@ -50,11 +53,11 @@ depend: depend2
 depend1:
 	mv Makefile Makefile.tmp
 	sed '/^#Depend/q' <Makefile.tmp >Makefile
-	$(CPP) $(INCLUDE) -M *.c >>Makefile
+	$(CPP) $(ZDEFS) $(INCLUDE) -M *.c >>Makefile
 	-rm Makefile.tmp
 
 depend2:
-	$(CPP) $(INCLUDE) -M *.c >.depend	
+	$(CPP) $(ZDEFS) $(INCLUDE) -M *.c >.depend	
 
 ifeq (.depend,$(wildcard .depend))
 include .depend
-- 
1.7.10.4