more cleanup

Reference: /n/atom/patch/applied/apecmdtidy2
Date: Mon Apr  7 22:35:12 CES 2014
Signed-off-by: quanstro@quanstro.net

--- /sys/src/ape/cmd/make/mkfile	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/make/mkfile	Mon Apr  7 22:35:05 2014
@@ -17,7 +17,7 @@
 </sys/src/cmd/mkone
 
 # stdio prevents turning on warnings -TVwc
-CFLAGS=-Tc -DSHELLCOM'="/bin/sh"'
+CFLAGS=-Tc
 YFLAGS=-S
 
 gram.c:	y.tab.c
--- /sys/src/ape/cmd/patch/addext.c	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/addext.c	Mon Apr  7 22:35:05 2014
@@ -18,9 +18,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and Paul Eggert */
 
-#if HAVE_CONFIG_H
 # include <config.h>
-#endif
 
 #ifndef HAVE_DOS_FILE_NAMES
 #define HAVE_DOS_FILE_NAMES 0
--- /sys/src/ape/cmd/patch/argmatch.c	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/argmatch.c	Mon Apr  7 22:35:05 2014
@@ -18,9 +18,7 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
-#if HAVE_CONFIG_H
 # include <config.h>
-#endif
 
 #include <argmatch.h>
 
--- /sys/src/ape/cmd/patch/backupfile.c	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/backupfile.c	Mon Apr  7 22:35:05 2014
@@ -19,9 +19,7 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.
    Some algorithms adapted from GNU Emacs. */
 
-#if HAVE_CONFIG_H
 # include <config.h>
-#endif
 
 #include <argmatch.h>
 #include <backupfile.h>
--- /sys/src/ape/cmd/patch/basename.c	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/basename.c	Mon Apr  7 22:35:05 2014
@@ -1,8 +1,6 @@
 /* basename.c -- return the last element in a path */
 
-#if HAVE_CONFIG_H
 # include <config.h>
-#endif
 
 #include <backupfile.h>
 
--- /sys/src/ape/cmd/patch/config.h	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/config.h	Mon Apr  7 22:35:05 2014
@@ -1,3 +1,7 @@
+#define _POSIX_SOURCE
+#define _BSD_EXTENSION
+#define ed_PROGRAM "/bin/ed"
+
 /* config.h.  Generated automatically by configure.  */
 /* config.hin.  Generated automatically from configure.in by autoheader.  */
 
--- /sys/src/ape/cmd/patch/getopt.c	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/getopt.c	Mon Apr  7 22:35:05 2014
@@ -30,9 +30,7 @@
 #define _NO_PROTO
 #endif
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #if !defined (__STDC__) || !__STDC__
 /* This is a separate conditional since some stdc systems
--- /sys/src/ape/cmd/patch/getopt1.c	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/getopt1.c	Mon Apr  7 22:35:05 2014
@@ -19,9 +19,7 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 USA.  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "getopt.h"
 
--- /sys/src/ape/cmd/patch/mkfile	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/mkfile	Mon Apr  7 22:35:05 2014
@@ -35,7 +35,5 @@
 </sys/src/cmd/mkone
 
 CC=pcc -c
-CFLAGS=-B -p -D_POSIX_SOURCE \
-	-D_BSD_EXTENSION -I. -DHAVE_CONFIG_H \
-	-Ded_PROGRAM="/bin/ed"
+CFLAGS=-B -I.
 
--- /sys/src/ape/cmd/patch/quotearg.c	Mon Apr  7 22:35:05 2014
+++ /sys/src/ape/cmd/patch/quotearg.c	Mon Apr  7 22:35:05 2014
@@ -18,9 +18,7 @@
 
 /* Written by Paul Eggert <eggert@twinsun.com> */
 
-#if HAVE_CONFIG_H
 # include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <quotearg.h>