--- ../cache/alpine-2.20/imap/src/osdep/unix/Makefile	2015-01-12 05:12:25.505178442 +0000
+++ ./imap/src/osdep/unix/Makefile	2016-12-11 07:08:54.821695452 +0000
@@ -131,13 +131,8 @@
 
 
 # Commands possibly overriden by the individual port
-
-ARRC=ar rc
-CC=cc
 LN=ln -s
-RANLIB=ranlib
-
-
+AARC="ar rc"
 # Standard distribution build parameters
 
 DEFAULTAUTHENTICATORS=ext md5 pla log
@@ -513,8 +508,10 @@
 	 SPOOLDIR=/var/spool \
 	 ACTIVEFILE=/var/lib/news/active \
 	 RSHPATH=/usr/bin/rsh \
-	 BASECFLAGS="$(GCCCFLAGS)"
-
+	 CC=$(TCC) \
+ 	 BASECFLAGS="$(GCCCFLAGS)" \
+	RANLIB="$(TRANLIB)"
+                                  
 lyn:	# LynxOS
 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
 	 CRXTYPE=nfs \
@@ -869,8 +866,13 @@
 all:	$(ARCHIVE)
 
 $(ARCHIVE): $(BINARIES)
-	sh -c '$(RM) $(ARCHIVE) || true'
+	rm -rf client-a
+	 { echo -n 'ar rc '; cat ARCHIVE; } >ARCHIVE.new
+	rm ARCHIVE
+	mv ARCHIVE.new ARCHIVE
+	chmod +x ARCHIVE
 	@$(CAT) ./ARCHIVE
+	
 	@$(SH) ./ARCHIVE
 
 .c.o: