* Remove CC=cc from Makefiles under the imap/ directory. Also redefine

    ARRC, as these are inherited from values set in the configure script,
    which in turn can be inherited from environment variables. This
    implies that to build c-client one needs to specify these variables,
    and since this is not being built as a stand-alone library anymore, we
    take these values from the configure script. Submitted by Robert
    Siebeck.

4 files changed, 105 insertions, 5 deletions

diff --git a/doc/tech-notes/tech-notes.txt b/doc/tech-notes/tech-notes.txt
index d5a5d015..890c3910 100644
--- a/doc/tech-notes/tech-notes.txt
+++ b/doc/tech-notes/tech-notes.txt
@@ -1,4 +1,106 @@
 
+                             Alpine Technical Notes
+
+   Version 2.22, January 2020
+
+Table of Contents
+
+  Introduction
+
+     * Design Goals
+     * Alpine Components
+
+  Background Details
+
+     * Domain Names
+     * RFC 2822 Compliance
+     * SMTP and Sendmail
+     * Internet Message Access Protocol (IMAP)
+     * Multipurpose Internet Mail Extensions (MIME)
+     * Folder Collections
+
+  Building and Installation
+
+     * Compile-time Options
+     * Including LDAP Functionality
+     * Including Kerberos 5 Functionality
+     * Other Alpine Compile-time Options
+     * IMAPd Compile-time Options
+     * Building the Alpine Programs
+     * Installing Alpine and Pico on UNIX Platforms
+     * Installing PC-Alpine
+     * Installing IMAPd
+     * Support Files and Environment Variables: UNIX Alpine
+     * Support Files, Environment Variables, and Registry Values:
+       PC-Alpine
+
+  Command Line Arguments
+
+     * Alpine
+     * Pico
+     * Pilot
+
+  Configuration and Preferences
+
+     * Alpine Configuration
+     * General Configuration Variables
+     * Configuration Features
+     * Hidden Config Variables and Features
+     * Retired Variables
+     * Tokens for Index and Replying
+     * Conditional Inclusion of Text for Reply-Leadin, Signatures, and
+       Templates
+     * Per Server Directory Configuration
+     * Color Configuration
+     * Index Line Color Configuration
+     * Role Configuration
+     * Filtering Configuration
+     * Scoring Configuration
+     * Other Rules Configuration
+     * Search Rules Configuration
+     * Patterns
+     * Configuring News
+       Configuration Notes
+          + Alpine in Function Key Mode
+          + Domain Settings
+          + Syntax for Collections
+          + Syntax for Folder Names
+          + Server Name Syntax
+          + Folder Namespaces
+          + What is a Mail Drop?
+          + Sorting a Folder
+          + Alternate Editor
+          + Signatures and Signature Placement
+          + Feature List Variable
+          + Configuration Inheritance
+          + Using Environment Variables
+          + SMTP Servers
+          + MIME.Types file
+          + Color Details
+          + S/MIME Overview
+          + Additional Notes on PC-Alpine
+
+  Behind the Scenes
+
+     * Address Books
+     * Remote Configuration
+     * Checkpointing
+     * Debug Files
+     * INBOX and Special Folders
+     * Internal Help Files
+     * International Character Sets
+     * Interrupted and Postponed Messages
+     * Message Status
+     * MIME: Reading a Message
+     * MIME: Sending a Message
+     * New Mail Notification
+     * NFS
+     * Printers and Printing
+     * Save and Export
+     * Sent Mail
+     * Spell Checker
+     * Terminal Emulation and Key Mapping
+
                                   Introduction
 
 Design Goals
diff --git a/imap/src/osdep/unix/Makefile b/imap/src/osdep/unix/Makefile
index ed33db0c..cdcbf315 100644
--- a/imap/src/osdep/unix/Makefile
+++ b/imap/src/osdep/unix/Makefile
@@ -132,10 +132,9 @@ EMPTYPROTO=unixproto
 
 # Commands possibly overridden by the individual port
 
-ARRC=ar rc
-CC=cc
+ARRC=$(AR) rc
 LN=ln -s
-RANLIB=ranlib
+RANLIB?=ranlib
 
 
 # Standard distribution build parameters
diff --git a/imap/tools/Makefile b/imap/tools/Makefile
index f2db51f9..58afc2d2 100644
--- a/imap/tools/Makefile
+++ b/imap/tools/Makefile
@@ -21,7 +21,6 @@
 #		Internet: MRC@CAC.Washington.EDU
 
 
-CC=cc
 RM=rm -f
 
 
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 21fe5dc3..943b891e 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 422 2020-05-09 15:01:02
+Alpine Commit 423 2020-05-10 12:09:40
 ============= h_news =================
 <HTML>
 <HEAD>