--- pgp/src/makefile.unx	2018/04/24 16:39:58	1.1.1.4
+++ pgp/src/makefile.unx	2018/04/24 16:42:03	1.1.1.6
@@ -1,5 +1,32 @@
 # makefile for PGP (unix)
 #
+# PGP 2.6 can be compiled to use either the modular exponentiation
+# routines that come with RSAREF or those that are built into the
+# multiprecision library (mpilib) that comes with PGP.  For UNIX machines
+# (and probably VAX/VMS, too), we recommend using the RSAREF routines.
+# For MSDOS, we recommend using the mpilib routines (there are assembly
+# language routines that mpilib can call under MSDOS making it much faster
+# than the C code in RSAREF).  To use the mpilib routines, you
+# should:
+#	(1) make sure you have the version of RSAREF that comes with
+#	    the PGP 2.6 distribution,
+#	(2) in this makefile, add the compiler switch -DUSEMPILIB to
+#	    CFLAGS for your system below,
+#	(3) in the RSAREF makefile, add the compiler switch
+#	    -DUSEMPILIB to CFLAGS before building RSAREF.
+# Note: when you build RSAREF with -DUSEMPILIB, rdemo and dhdemo will
+# fail to link, because they will be unable to find the modular
+# exponentiation routines.  This is OK.
+#
+# Alternatively, to build PGP 2.6 with the RSAREF exponentiation routines,
+#	(1) you can use any version of the March 16, 1994 distribution
+#	    of RSAREF.
+#	(2) you need not modify this makefile,
+#	(3) you need not modify the RSAREF makefile.
+#
+# Note:  If your system does not have memmove, then you should add memmove.o
+# to OBJS_EXT for your rule and send that in as a bug for your platform.
+#
 # CFLAGS options:
 #
 # -DHIGHFIRST if building PGP on a big-endian system
@@ -32,7 +59,7 @@ CFLAGS= -O -DUNIX -DPORTABLE $(BYTEORDER
 
 CC      = cc
 LD      = cc		# Link command
-LDFLAGS	=
+LDFLAGS	= 
 CPP     = $(CC) -E
 DBG	= -O
 
@@ -52,10 +79,12 @@ default:
 	@echo ""
 	@echo "where <system> can be:"
 	@echo "        sun4gcc, sun4cc(*), sun3gcc, sun3asm, sun3cc(*), sun386i, sunspc,"
-	@echo "        sysv_386, sco-2.0, x286(*), hpux, linux, mips-ultrix, vax-ultrix,"
+	@echo "        sysv_386, sco-2.0, x286(*), linux, mips-ultrix, vax-ultrix,"
 	@echo "        xenix386, mach_386, 386bsd, isc, isc_asm, 3b1, 3b1_asm, rs6000,"
-	@echo "        bsd, bsdgcc, vax_bsd43, rt_aos4, osf, sgigcc_asm, sgigcc, irix"
-	@echo "        newsgcc, newsasm, aux(*), aux-gcc, os2, djgpp"
+	@echo "        bsd, bsdgcc, vax_bsd43, rt_aos4, osf, sgigcc_asm, sgigcc, irix,"
+	@echo "        irix_asm, newsgcc, newsasm, aux(*), aux-gcc, os2, djgpp, sun4sunos5gcc,"
+	@echo "        hpux-pa-ansi, hpux-pa-gcc, hpux-pa(*), hpux-68k-ansi, hpux-68k-gcc"
+	@echo "        hpux-68k(*), next, next486, netbsd"
 	@echo ""
 	@echo "for targets marked with (*) you must first get unproto, see"
 	@echo "setup.doc for further details"
@@ -63,30 +92,17 @@ default:
 
 all: $(PROJ)
 
-# RSAOBJS = rsa.o nn.o digit.o r_random.o r_stdlib.o
-
-rsaref: $(RSAOBJS)
-
-RSADIR = ../../rsaref/source/
-
-rsa.o: $(RSADIR)rsa.c global.h $(RSADIR)rsaref.h $(RSADIR)r_random.h \
-  $(RSADIR)md5.h
-	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) -Dstatic= $(RSADIR)rsa.c
-
-nn.o : $(RSADIR)nn.c global.h $(RSADIR)rsaref.h \
-  $(RSADIR)nn.h $(RSADIR)digit.h
-	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) $(RSADIR)nn.c
-
-digit.o : $(RSADIR)digit.c global.h $(RSADIR)rsaref.h $(RSADIR)nn.h \
-  $(RSADIR)digit.h
-	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) $(RSADIR)digit.c
+# If you want to use MPILIB, uncomment this line:
+USEMPILIB = -DUSEMPILIB
 
-r_random.o : $(RSADIR)r_random.c global.h $(RSADIR)rsaref.h  \
-  $(RSADIR)r_random.h $(RSADIR)md5.h
-	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) $(RSADIR)r_random.c
+# For an RSAREF version, uncomment the following lines
+RSADIR = ../../rsaref
+RSALIBDIR = $(RSADIR)/install/unix
+RSAINCDIR = -I$(RSADIR)/source -I$(RSADIR)/test $(USEMPILIB)
+RSALIBS = $(RSALIBDIR)/rsaref.a
+RSAOBJS = rsaglue2.o
 
-r_stdlib.o : $(RSADIR)r_stdlib.c global.h $(RSADIR)rsaref.h
-	$(CC) -c -I$(RSADIR) -I. $(CFLAGS) $(RSADIR)r_stdlib.c
+# Assembly-language subroutine dependencies
 
 _80386.o:	80386.S
 	$(CPP) $(ASMDEF) 80386.S > _80386.s
@@ -103,6 +119,11 @@ _zmatch.o:	zmatch.S
 	$(ASM) -o $@ _zmatch.s
 	rm -f _zmatch.s
 
+sparc.o:	sparc.S
+	$(CPP) $(ASMDEF) sparc.S > _sparc.s
+	$(ASM) -o $@ _sparc.s
+	rm -f _sparc.s
+
 #mc68020.o:
 #	$(CC) -c mc68020.S
 
@@ -113,148 +134,204 @@ OBJ1 =	pgp.o crypto.o keymgmt.o fileio.o
 	mdfile.o more.o armor.o mpilib.o mpiio.o \
 	genprime.o rsagen.o random.o idea.o passwd.o \
 	md5.o system.o language.o getopt.o keyadd.o \
-	config.o keymaint.o charset.o rsaglue.o
+	config.o keymaint.o charset.o \
+	randpool.o noise.o
 
-OBJS =	$(OBJ1) $(ZIPOBJS) $(OBJS_EXT) $(RSAOBJS)
+OBJS =	$(OBJ1) $(ZIPOBJS) $(RSAOBJS) $(OBJS_EXT)
+CFLAGS = $(CFLAGS) -I$(RSAINCDIR)
 
 $(PROJ):	$(OBJS)
-		$(LD) -o $(PROJ) $(OBJS) $(LDFLAGS) $(LIBS_EXT)
+		$(LD) -o $(PROJ) $(OBJS) $(LDFLAGS) $(LIBS_EXT) $(RSALIBS)
 
 
 linux:
 	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o _zmatch.o" \
-	CFLAGS="-O -DUNIX -DIDEA32 -DASM"
+	CFLAGS="$(RSAINCDIR) -O6 -g3 -DUNIX -DIDEA32 -DASM" LDFLAGS="-v"
 
 386bsd:
 	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o _zmatch.o" \
-	CFLAGS="-O -DUNIX -DIDEA32 -DASM -DMAX_NAMELEN=255"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DASM -DMAX_NAMELEN=255"
+
+netbsd:
+	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o _zmatch.o" \
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DASM -DMAX_NAMELEN=255"
 
 # Sun 3 with gcc
 # change -traditional-cpp to -traditional for gcc < 2.0
 sun3gcc:
 	$(MAKE) all CC=gcc LD=gcc \
-	CFLAGS="-O -traditional-cpp -DUNIX -DHIGHFIRST -DIDEA32 -DPORTABLE"
+	CFLAGS="$(RSAINCDIR) -O -traditional-cpp -DUNIX -DHIGHFIRST -DIDEA32 -DPORTABLE"
 
 sun3asm:
 	$(MAKE) all CC=gcc LD=gcc OBJS_EXT=mc68020.o \
-	CFLAGS="-O -traditional-cpp -DUNIX -DHIGHFIRST -DIDEA32"
+	CFLAGS="$(RSAINCDIR) -O -traditional-cpp -DUNIX -DHIGHFIRST -DIDEA32"
 
 # Sun 3 with standard cc: compile with unproto
 sun3cc: unproto/cpp
 	$(MAKE) all CC=cc LD=cc \
-	CFLAGS="-Qpath unproto -O -DUNIX -DHIGHFIRST -DIDEA32 -DPORTABLE"
+	CFLAGS="$(RSAINCDIR) -Qpath unproto -O -DUNIX -DHIGHFIRST -DIDEA32 -DPORTABLE"
 
 # Sun 4 SPARC with gcc (tested with gcc 1.39 and newer, sparc.s can not be used
 # with older versions of gcc)
 # change -traditional-cpp to -traditional for gcc < 2.0
 sun4gcc:
-	$(MAKE) all CC=gcc LD=gcc OBJS_EXT=sparc.o \
-	CFLAGS="-O -traditional-cpp -DUNIX -DHIGHFIRST -DIDEA32"
+	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="sparc.o memmove.o" \
+	CFLAGS="$(RSAINCDIR) -O -traditional-cpp -DUNIX -DHIGHFIRST -DIDEA32"
 
 # Sun 4 SPARC with standard cc: compile with unproto
 sun4cc: unproto/cpp
-	$(MAKE) all CC=cc LD=cc OBJS_EXT=sparc.o \
-	CFLAGS="-Qpath unproto -O -DUNIX -DHIGHFIRST -DIDEA32"
+	$(MAKE) all CC=cc LD=cc OBJS_EXT="sparc.o memmove.o"  \
+	CFLAGS="$(RSAINCDIR) -Qpath unproto -O -DUNIX -DHIGHFIRST -DIDEA32"
+
+# Sun 4 running Sunos5 (Solaris)...
+sun4sunos5gcc:
+	$(MAKE) all CC=gcc LD=gcc OBJS_EXT=sparc.o \
+	CFLAGS="$(RSAINCDIR) -O -traditional-cpp -DSOLARIS -DUNIX -DHIGHFIRST -DIDEA32" \
+	ASMDEF=-DSYSV
 
 sun386i:
-	$(MAKE) all CC=gcc LD=gcc OBJS_EXT=_80386.o \
-	CFLAGS="-O -DUNIX -DIDEA32"
+	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o memmove.o" \
+	CFLAGS="$(RSAINCDIR) -I. -O -DUNIX -DIDEA32 -DNOTERMIO" \
+	ASMDEF=-DSYSV
 
 sunspc:
 	$(MAKE) all CC="ccspc -B/1.8.6/sun4 -ansi -w -I/usr/include" \
-	CFLAGS="-O -DUNIX -DIDEA32 -DHIGHFIRST -DUNIT32 -DMERRITT" \
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DHIGHFIRST -DUNIT32 -DMERRITT" \
 	OBJS_EXT=sparc.o
 
 # Sony newsos v3 for m68k, with gcc
 # change -traditional-cpp to -traditional for gcc < 2.0
 newsgcc:
 	$(MAKE) all CC=gcc LD=gcc \
-	CFLAGS="-O -I. -traditional-cpp -DNOTERMIO -D_BSD -DUNIX -DHIGHFIRST -DIDEA32 -DPORTABLE"
+	CFLAGS="$(RSAINCDIR) -O -I. -traditional-cpp -DNOTERMIO -D_BSD -DUNIX -DHIGHFIRST -DIDEA32 -DPORTABLE"
 
 #  with asm
 newsasm:
 	$(MAKE) all CC=gcc LD=gcc OBJS_EXT=mc68020.s \
-	CFLAGS="-O -I. -traditional-cpp -DNOTERMIO -D_BSD -DUNIX -DHIGHFIRST -DIDEA32"
+	CFLAGS="$(RSAINCDIR) -O -I. -traditional-cpp -DNOTERMIO -D_BSD -DUNIX -DHIGHFIRST -DIDEA32"
 
 sysv:
 	$(MAKE) all CPP=/lib/cpp \
-	CFLAGS="-O -DUNIX -DPORTABLE -DUSE_NBIO $(BYTEORDER)"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DPORTABLE -DUSE_NBIO $(BYTEORDER)"
 
 # optimized version with 80386.S
 sysv_386:
 	$(MAKE) all CPP="/lib/cpp -DSYSV" OBJS_EXT="_80386.o _zmatch.o" \
-	CFLAGS="-O -DUNIX -DIDEA32 -DUSE_NBIO -DASM"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DUSE_NBIO -DASM"
 
 xenix386:
 	$(MAKE) all CPP=/lib/cpp OBJS_EXT="_80386.o _zmatch.o" \
-	CFLAGS="-O -DUNIX -DSVR2 -DIDEA32 -DUSE_NBIO -DASM"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DSVR2 -DIDEA32 -DUSE_NBIO -DASM"
 
 # Interactive Unix SVR3/386 version 3.2 with gcc
 isc:
 	$(MAKE) all CC=gcc LD=gcc LDFLAGS="-lcposix" \
-	CFLAGS="-O -DUNIX -DIDEA32 -DUSE_NBIO -DPORTABLE -DNO_ITIMER"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DUSE_NBIO -DPORTABLE -DNO_ITIMER"
 
 isc_asm:
 	$(MAKE) all CC=gcc LD=gcc OBJS_EXT=_80386.o ASMDEF=-DSYSV \
-	CFLAGS="-O -DUNIX -DIDEA32 -DUSE_NBIO -DNO_ITIMER" LDFLAGS="-lcposix"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DUSE_NBIO -DNO_ITIMER" LDFLAGS="-lcposix"
 
 mach_386:
 	$(MAKE) all CC=gcc LD=gcc CPP=/lib/cpp OBJS_EXT=_80386.o \
-	CFLAGS="-O -I. -DMACH -DUNIX -DIDEA32 -DNOTERMIO"
+	CFLAGS="$(RSAINCDIR) -O -I. -DMACH -DUNIX -DIDEA32 -DNOTERMIO"
 
 sco-2.0:
 	$(MAKE) all CC=gcc LD=gcc CPP=/usr/lib/xcpp OBJS_EXT=_80386.o \
-	ASMDEF=-DSYSV CFLAGS="-Dsco -O -DUNIX -DIDEA32 -DUSE_NBIO"
+	ASMDEF=-DSYSV CFLAGS="$(RSAINCDIR) -Dsco -O -DUNIX -DIDEA32 -DUSE_NBIO"
 
 # Xenix 286
 x286:
 	$(MAKE) all CC="sh ccc.x286 -M2l" LD="cc -M2l" ASM="cc -M2l" \
 	OBJS_EXT=8086.o  LDFLAGS="-F 3000" \
-	CFLAGS="-LARGE -Ot -DUNIX -DNOPROTO -DSMALL_MEM -DDYN_ALLOC \
+	CFLAGS="$(RSAINCDIR) -LARGE -Ot -DUNIX -DNOPROTO -DSMALL_MEM -DDYN_ALLOC \
 	-DUSE_NBIO -DSVR2"
 
 # AIX/386 v.1.3
 aix386:
 	$(MAKE) all CPP="/lib/cpp -DSYSV" \
-	CFLAGS="-O -DUNIX -DIDEA32 -DUSE_NBIO -DSYSV -DPORTABLE"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DUSE_NBIO -DSYSV -DPORTABLE"
 
 # AIX/370  (like general SysV)
 aix370:
 	$(MAKE) all CPP=/lib/cpp \
-	CFLAGS="-O -DUNIX -DIDEA32 -DUSE_NBIO -DSYSV -DHIGHFIRST -DPORTABLE"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DUSE_NBIO -DSYSV -DHIGHFIRST -DPORTABLE"
 
 3b1:
 	$(MAKE) all CC=gcc LD=gcc CPP=/usr/lib/cpp \
-	CFLAGS="-O -I. -DUNIX -DSVR2 -DPORTABLE -DUSE_NBIO -DHIGHFIRST"
+	CFLAGS="$(RSAINCDIR) -O -I. -DUNIX -DSVR2 -DPORTABLE -DUSE_NBIO -DHIGHFIRST \
+	-DMAX_NAMELEN=14"
 
 3b1_asm:
-	$(MAKE) all CC=gcc LD=gcc CPP=/usr/lib/cpp OBJS_EXT=3B1_68010.o \
-	CFLAGS="-O -I. -DUNIX -DSVR2 -DUSE_NBIO -DHIGHFIRST"
+	$(MAKE) all CC=gcc LD=gcc CPP=/usr/lib/cpp OBJS_EXT=3b168010.o \
+	CFLAGS="$(RSAINCDIR) -O -I. -DUNIX -DSVR2 -DUSE_NBIO -DHIGHFIRST -DMAX_NAMELEN=14"
 
 # Silicon Graphics Iris IRIX
 sgigcc:
 	$(MAKE) all CC=gcc LD=gcc CPP=/usr/lib/cpp \
-	CFLAGS="-O -DUNIX -DPORTABLE -DUSE_NBIO -DHIGHFIRST"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DPORTABLE -DUSE_NBIO -DHIGHFIRST"
 
 # SGI with assembler modules
 sgigcc_asm:
 	$(MAKE) all CC=gcc LD=gcc CPP=/usr/lib/cpp OBJS_EXT="r3000.o r3kd.o" \
-	CFLAGS="-O -DUNIX -DUSE_NBIO -DHIGHFIRST"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DUSE_NBIO -DHIGHFIRST"
 
 irix:
 	$(MAKE) all CC=cc LD=cc \
-	CFLAGS="-O -DUNIX -DPORTABLE -DUSE_NBIO -DHIGHFIRST -acpp"
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DPORTABLE -DUSE_NBIO -DHIGHFIRST -acpp"
 
-hpux:
+irix_asm:
+	$(MAKE) all CC=cc LD=cc OBJS_EXT="r3000.o r3kd.o"\
+	CFLAGS="$(RSAINCDIR) -O -g -DUNIX -DUSE_NBIO -DHIGHFIRST -acpp"
+
+# Users of PGP versions <2.5 will expect a target 'hpux' to build for
+# a snake (HP Series 700 RISC machine).  Don't disappoint them.
+hpux: hpux-pa-ansi
+
+# HP series 700 pa-risc running HP/UX with HP's ANSI cc
+# UNTESTED for PGP 2.5
+hpux-pa-ansi:
 	$(MAKE) all CPP=/usr/lib/cpp \
-	CFLAGS="-Aa +O3 +Obb5000 -D_INCLUDE_POSIX_SOURCE \
-	-D_INCLUDE_HPUX_SOURCE -D_INCLUDE_XOPEN_SOURCE -DHIGHFIRST -DUNIX \
+	CFLAGS="$(RSAINCDIR) -Aa +O3 +Obb5000 -D_HPUX_SOURCE -DHIGHFIRST \
+	-DUNIX -DPORTABLE -DUSE_SELECT -DIDEA32 -DMERRITT"
+
+# HP series 700 pa-risc running HP/UX with gcc
+# UNTESTED for PGP 2.5
+hpux-pa-gcc:
+	$(MAKE) all CC=gcc LD=gcc \
+	CFLAGS="$(RSAINCDIR) -O2 -D_HPUX_SOURCE -DHIGHFIRST -DUNIX \
 	-DPORTABLE -DUSE_SELECT -DIDEA32 -DMERRITT"
 
+# HP series 700 pa-risc running HP/UX with HP's standard cc: use unproto
+# UNTESTED for PGP 2.5
+hpux-pa: unproto/cpp
+	$(MAKE) all \
+	CFLAGS="-tp,./unproto/cpp $(RSAINCDIR) -DHIGHFIRST \
+	-DUNIX -DPORTABLE -DUSE_SELECT -DIDEA32 -DMERRITT"
+
+# HP series 300 mc68k running HP/UX with HP's ANSI cc
+hpux-68k-ansi:
+	$(MAKE) all \
+	CFLAGS="$(RSAINCDIR) -Aa +O2 -D_HPUX_SOURCE -DHIGHFIRST -DUNIX \
+	-DPORTABLE -DUSE_SELECT -DIDEA32"
+
+# HP series 300 mc68k running HP/UX with gcc
+hpux-68k-gcc:
+	$(MAKE) all CC=gcc LD=gcc \
+	CFLAGS="$(RSAINCDIR) -O2 -D_HPUX_SOURCE -DHIGHFIRST -DUNIX \
+	-DPORTABLE -DUSE_SELECT -DIDEA32"
+
+# HP series 300 mc68k running HP/UX with HP's standard cc: use unproto
+# UNTESTED for PGP 2.5
+hpux-68k: unproto/cpp
+	$(MAKE) all \
+	CFLAGS="-tp,./unproto/cpp $(RSAINCDIR) -DHIGHFIRST \
+	-DUNIX -DPORTABLE -DUSE_SELECT -DIDEA32"
+
 # VAX Ultrix 4.2 BSD rev. 96, system #3 with gcc
 vax-ultrix:
 	$(MAKE) all CC=gcc LD=gcc \
-	CFLAGS="-O -DUNIX -DPORTABLE -DUSE_SELECT \
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -DPORTABLE -DUSE_SELECT \
 	-DSIG_IGN=1 -DSIG_DFL=0"
 
 # DEC Ultrix 4.2 BSD with gcc with MIPSco processors
@@ -264,69 +341,78 @@ vax-ultrix:
 #r3000.o: r3000.s
 #	$(AS) -o $@ r3000.s
 #
+#mips-ultrix:
+#	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="r3kd.o r3000.o"\
+#	CFLAGS="$(RSAINCDIR) $(DBG) -DUNIX -DUSE_SELECT -DIDEA32"
+
 mips-ultrix:
-	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="r3kd.o r3000.o"\
-	CFLAGS="$(DBG) -DUNIX -DUSE_SELECT -DIDEA32"
+	$(MAKE) all CC=gcc LD=gcc \
+	CFLAGS="$(RSAINCDIR) $(DBG) -DUNIX -DPORTABLE \
+	   -DMPORTABLE -DUSE_SELECT -DIDEA32"
 
 # RS6000 running AIX
 rs6000:
-	$(MAKE) all CFLAGS="-O -DUNIX -DNOTERMIO -DPORTABLE \
+	$(MAKE) all CFLAGS="$(RSAINCDIR) -O -DUNIX -DNOTERMIO -DPORTABLE \
 	-DMODERN -DHIGHFIRST -DIDEA32"
 
 next:
 	$(MAKE) all \
-	CFLAGS="-O -DNEXT -DUNIX -DHIGHFIRST -DMACH -DPORTABLE -DNOTERMIO"
+	CFLAGS="$(RSAINCDIR) -O -DNEXT -DUNIX -DHIGHFIRST -DMACH -DPORTABLE -DNOTERMIO"
+
+next486:
+	$(MAKE) all \
+	CFLAGS="$(RSAINCDIR) -O -DNEXT -DUNIX -DMACH -DPORTABLE \
+	-DIDEA32 -DNOTERMIO"
 
 bsdgcc:
 	$(MAKE) all CC=gcc LD=gcc \
-	CFLAGS="-O -I. -DNOTERMIO -D_BSD -DUNIX -DPORTABLE -DUSE_NBIO $(BYTEORDER)"
+	CFLAGS="$(RSAINCDIR) -O -I. -DNOTERMIO -D_BSD -DUNIX -DPORTABLE -DUSE_NBIO $(BYTEORDER)"
 
 bsd:
 	$(MAKE) all "LD=cc -s" \
-	CFLAGS="-O -I. -B/lib/ -DNOTERMIO -D_BSD -DUNIX -DPORTABLE -DUSE_NBIO $(BYTEORDER)"
+	CFLAGS="$(RSAINCDIR) -O -I. -B/lib/ -DNOTERMIO -D_BSD -DUNIX -DPORTABLE -DUSE_NBIO $(BYTEORDER)"
 
 sequent: unproto/cpp
 	$(MAKE) all "LD=cc -s -j" CPP=/usr/lib/cpp \
-	CFLAGS="-j -O -I. -Yp,unproto -DUNIX -DNOTERMIO -DPORTABLE -DUSE_NBIO $(BYTEORDER)"
+	CFLAGS="$(RSAINCDIR) -j -O -I. -Yp,unproto -DUNIX -DNOTERMIO -DPORTABLE -DUSE_NBIO $(BYTEORDER)"
 
 # RT running bsd with gcc
 rt_aos4:
 	$(MAKE) all CC=gcc LD=gcc \
-	CFLAGS="-O -DUNIX -D_BSD -DMAX_NAMELEN=255 -DPORTABLE -DHIGHFIRST -DNOTERMIO -I."
+	CFLAGS="$(RSAINCDIR) -O -DUNIX -D_BSD -DMAX_NAMELEN=255 -DPORTABLE -DHIGHFIRST -DNOTERMIO -I."
 
 # Vax running bsd with gcc
 vax_bsd43:
 	$(MAKE) all CC=gcc LD=gcc \
-	CFLAGS="-O -I. -DUNIX -D_BSD -DMAX_NAMELEN=255 -DNOTERMIO -DPORTABLE"
+	CFLAGS="$(RSAINCDIR) -O -I. -DUNIX -D_BSD -DMAX_NAMELEN=255 -DNOTERMIO -DPORTABLE"
 
 # The Open Software Foundation's OSF/1
 osf:
 	$(MAKE) all \
-	CFLAGS="-O -I. -D_BSD -DUNIX -DNOTERMIO -DPORTABLE $(BYTEORDER)"
+	CFLAGS="$(RSAINCDIR) -O -I. -D_BSD -DUNIX -DNOTERMIO -DPORTABLE $(BYTEORDER)"
 
 # A/UX 3.0 using unproto (mine is invoked as a cpp using the CFLAGS shown
 # I placed the cpp in a subdirectory of /src/pgp called unproto
 aux: unproto/cpp
 	$(MAKE) all CC=cc \
 	LDFLAGS=-lposix \
-	CFLAGS="-B unproto/ -tp -DSVR2 \
+	CFLAGS="$(RSAINCDIR) -B unproto/ -tp -DSVR2 \
 	-DHIGHFIRST -DUNIX -DPORTABLE -DUSE_SELECT -DUPTON"
 aux-gcc:
 	$(MAKE) all CC=gcc LD=gcc \
 	LDFLAGS=-lposix \
-	CFLAGS="-O2 -DSVR2 -traditional-cpp \
-	-DHIGHFIRST -DUNIX -DPORTABLE -DUSE_SELECT -DUPTON"
+	CFLAGS="$(RSAINCDIR) -O2 -DSVR2 -DHIGHFIRST -DUNIX -DPORTABLE -DUSE_SELECT -DUPTON"
 
 # optimized version with 80386.S for emx 0.8e, OS/2 2.0 or DOS
 os2:
 	$(MAKE) all PROJ=pgp.exe OBJS_EXT="_80386.o _zmatch.o" \
-	CC="gcc -Zomf" CFLAGS="-O -DOS2 -DASM -DIDEA32" \
+	CC="gcc -Zomf" CFLAGS="$(RSAINCDIR) -O -DOS2 -DASM -DIDEA32" \
 	ASM="gcc -Zomf -c" LD="gcc" LDFLAGS="-s pgp.def"
 
 # DJGPP, DJ Delorie's port of GNU C to MS-DOA (thanks DJ!).  Tested with dmake.
 # You may have to rehack this -- I'm not good with makefiles.
 djgpp:
-	$(MAKE) "OBJS_EXT=80386.o zmatch.o" CC=gcc LD=gcc \
+	$(MAKE) "OBJS_EXT=_80386.o _zmatch.o" CC=gcc LD=gcc \
 	"CFLAGS=-O2 -DSMALL_MEM -DASM -DIDEA32" all
 
 #