Style:

$Id$ should be preceded by a tab
Don't include ../Makefile.inc when it is not used explicitly
Use the normal amount of horizontal and vertical whitspace (1 tab/none)
Don't override the (correct) default for MAN1
Use the correct order for -I paths
Use config.h generated by `configure', don't use a huge CFLAGS statement
Enable useage of libreadline in config.h, configure didn't enable it itself.

2 files changed, 76 insertions, 19 deletions

diff --git a/gnu/usr.bin/bc/Makefile b/gnu/usr.bin/bc/Makefile
index fa6456f..040f06a 100644
--- a/gnu/usr.bin/bc/Makefile
+++ b/gnu/usr.bin/bc/Makefile
@@ -1,25 +1,18 @@
-# $Id: Makefile,v 1.10 1998/05/01 02:49:40 scrappy Exp $
-
-.include "${.CURDIR}/../Makefile.inc"
+#	$Id: Makefile,v 1.11 1998/05/01 04:42:53 ache Exp $
 
 .PATH:	${.CURDIR}/../../../contrib/bc/bc \
 	${.CURDIR}/../../../contrib/bc/lib \
 	${.CURDIR}/../../../contrib/bc/doc
 
-PROG=		bc
-BCSRCS=		execute.c global.c load.c main.c storage.c util.c \
-		number.c getopt.c getopt1.c
-GENSRCS=	bc.c scan.c
-SRCS=		${GENSRCS} ${BCSRCS}
-MAN1=		bc.1
+PROG=	bc
+BCSRCS=	execute.c global.c load.c main.c storage.c util.c \
+	number.c getopt.c getopt1.c
+GENSRCS=bc.c scan.c
+SRCS=	${GENSRCS} ${BCSRCS}
 
-YACC=		bison -y
+YACC=	bison -y
 
-CFLAGS+=	-DHAVE_VPRINTF=1  -DSTDC_HEADERS=1 -DHAVE_ISGRAPH=1 \
-		-DHAVE_LIMITS_H=1 -DHAVE_STDARG_H=1 -DHAVE_STDDEF_H=1 \
-		-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_UNISTD_H=1 \
-		-DREADLINE=1 \
-		-I${.CURDIR}/../../../contrib/bc/h -I${.CURDIR} -I.
+CFLAGS+=-I${.CURDIR} -I. -I${.CURDIR}/../../../contrib/bc/h
 
 bc.h: bc.c
 	mv y.tab.h bc.h
diff --git a/gnu/usr.bin/bc/config.h b/gnu/usr.bin/bc/config.h
index abdc702..98bd4ca 100644
--- a/gnu/usr.bin/bc/config.h
+++ b/gnu/usr.bin/bc/config.h
@@ -1,5 +1,69 @@
-/* config.h */
-#ifndef __STDC__
-#define VARARGS
-#endif
+/* config.h.  Generated automatically by configure.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define if you don't have vprintf but do have _doprnt.  */
+/* #undef HAVE_DOPRNT */
+
+/* Define if you have the vprintf function.  */
+#define HAVE_VPRINTF 1
+
+/* Define if on MINIX.  */
+/* #undef _MINIX */
+
+/* Define if the system does not provide POSIX.1 features except
+   with this defined.  */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define if you need to in order for stat and other things to work.  */
+/* #undef _POSIX_SOURCE */
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+/* #undef size_t */
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if lex declares yytext as a char * by default, not a char[].  */
 #define YYTEXT_POINTER 1
+
+/* PACKAGE name */
+#define PACKAGE "bc"
+
+/* Package VERSION number */
+#define VERSION "1.04"
+
+/* define if the math lib is to be loaded from a file. */
+/* #undef BC_MATH_FILE */
+
+/* Define to use the readline library. */
+#define READLINE 1
+
+/* Define to `size_t' if <sys/types.h> and <stddef.h> don't define.  */
+/* #undef ptrdiff_t */
+
+/* Define if you have the isgraph function.  */
+#define HAVE_ISGRAPH 1
+
+/* Define if you have the <lib.h> header file.  */
+/* #undef HAVE_LIB_H */
+
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <stdarg.h> header file.  */
+#define HAVE_STDARG_H 1
+
+/* Define if you have the <stddef.h> header file.  */
+#define HAVE_STDDEF_H 1
+
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1