From 7fe712882b909931088a318c08041b0e7974a000 Mon Sep 17 00:00:00 2001
From: Eduardo Chappa <chappa@washington.edu>
Date: Sat, 2 Nov 2013 02:51:18 -0600
Subject:  *  Update to version 2.19.1  *  Upgrade UW-IMAP to Panda IMAP from
 https://github.com/jonabbey/panda-imap.  *  Replace tabs by spaces in From
 and Subject fields to control for size in     screen of these fields. Change
 only in index screen display.

---
 imap/src/osdep/unix/Makefile | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

(limited to 'imap/src/osdep/unix/Makefile')

diff --git a/imap/src/osdep/unix/Makefile b/imap/src/osdep/unix/Makefile
index 78913acc..a38d15fb 100644
--- a/imap/src/osdep/unix/Makefile
+++ b/imap/src/osdep/unix/Makefile
@@ -1,15 +1,7 @@
 # ========================================================================
-# Copyright 1988-2007 University of Washington
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# 
+# Copyright 2008-2011 Mark Crispin
 # ========================================================================
-
+#
 # Program:	C client makefile
 #
 # Author:	Mark Crispin
@@ -21,7 +13,17 @@
 #		Internet: MRC@CAC.Washington.EDU
 #
 # Date:		11 May 1989
-# Last Edited:	17 December 2007
+# Last Edited:	29 August 2011
+#
+# Previous versions of this file were
+#
+# Copyright 1988-2008 University of Washington
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
 
 
 # Command line build parameters
@@ -199,7 +201,7 @@ a41:	# AIX 4.1 for RS/6000
 	 BASECFLAGS="-g -Dunix=1 -D_BSD -qro -qroconst" \
 	 BASELDFLAGS="-ls"
 
-a52:	# Attempt at AIX 5.2
+a52:	# AIX 5.2
 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
 	 SIGTYPE=psx CHECKPW=a41 CRXTYPE=nfs \
 	 SPOOLDIR=/var/spool \
@@ -437,7 +439,7 @@ gso:	os_sol.h	# GCC Solaris
 	 ACTIVEFILE=/usr/share/news/active \
 	 RSHPATH=/usr/bin/rsh \
 	 BASECFLAGS="$(GCCCFLAGS)" \
-	 BASELDFLAGS="-lsocket -lnsl -lgen" \
+	 BASELDFLAGS="-lsocket -lnsl -lgen -R/usr/local/ssl/lib" \
 	 RANLIB=true CC=gcc
 
 gsu:	# GCC SUN-OS
@@ -608,6 +610,14 @@ pyr:	# Pyramid
 	 CRXTYPE=nfs \
 	 BASECFLAGS="-g -Dconst="
 
+qn6:	# QNX 6
+	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
+	 CRXTYPE=nfs \
+	 SPOOLDIR=/var/spool \
+	 ACTIVEFILE=/var/lib/news/active \
+	 RSHPATH=/usr/bin/rsh \
+	 BASECFLAGS="$(GCCFLAGS)"
+
 qnx:	# QNX
 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
 	 CHECKPW=psx LOGINPW=old \
@@ -725,7 +735,7 @@ soc:	os_sol.h	# Solaris with cc
 	 ACTIVEFILE=/usr/share/news/active \
 	 RSHPATH=/usr/bin/rsh \
 	 BASECFLAGS="-g -O -w" \
-	 BASELDFLAGS="-lsocket -lnsl -lgen" \
+	 BASELDFLAGS="-lsocket -lnsl -lgen -R/usr/local/ssl/lib" \
 	 RANLIB=true CC=/opt/SUNWspro/bin/cc
 
 
@@ -773,7 +783,7 @@ sol:	os_sol.h	# Solaris
 	 ACTIVEFILE=/usr/share/news/active \
 	 RSHPATH=/usr/bin/rsh \
 	 BASECFLAGS="-g -O2" \
-	 BASELDFLAGS="-lsocket -lnsl -lgen" \
+	 BASELDFLAGS="-lsocket -lnsl -lgen -R/usr/local/ssl/lib" \
 	 RANLIB=true CC=ucbcc
 
 sos:	# Secure OSF/1
@@ -859,8 +869,8 @@ all:	$(ARCHIVE)
 
 $(ARCHIVE): $(BINARIES)
 	sh -c '$(RM) $(ARCHIVE) || true'
-	@$(CAT) ARCHIVE
-	@$(SH) ARCHIVE
+	@$(CAT) ./ARCHIVE
+	@$(SH) ./ARCHIVE
 
 .c.o:
 	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
-- 
cgit v1.2.3-54-g00ecf