Drop support for -DRELEASE_BUILD_FIXIT and -DCRUNCHED_BINARY in

${CFLAGS}.  The only supported method thus is -DRELEASE_CRUNCH.

5 files changed, 5 insertions, 12 deletions

diff --git a/release/Makefile b/release/Makefile
index ac89c42..061c359 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -393,16 +393,10 @@ release.3:
 
 # Make and install the three crunched binaries which live on the floppies.
 # You are not supposed to like this :-)
-#
-# NB: the "RELEASE_BUILD_FIXIT" magic prevents vi from including the
-# Tcl and Perl APIs.  See also /usr/src/usr.bin/vi/Makefile.
-# It also prevents ls linking against termcap by disabling color support.
-# See /usr/src/bin/ls/Makefile.
 release.4:
 	@mkdir -p /stand
 	rm -rf ${RD}/crunch
 	mkdir -p ${RD}/crunch
-	export RELEASE_BUILD_FIXIT=noway ; \
 	for j in ${CRUNCH_TARGETS} ; do \
 		rm -rf $${j}_crunch && \
 		mkdir $${j}_crunch && \
@@ -410,8 +404,7 @@ release.4:
 		  ( ( [ -f ${.CURDIR}/${MACHINE}/$${j}_crunch.conf ] && \
 		    crunchgen ${.CURDIR}/${MACHINE}/$${j}_crunch.conf ) || \
 		    ( crunchgen ${.CURDIR}/$${j}_crunch.conf ) ) && \
-		  ${MAKE} -f $${j}_crunch.mk subclean all \
-		    NOCRYPT=yes "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY") && \
+		  ${MAKE} -f $${j}_crunch.mk subclean all && \
 		mv $${j}_crunch/$${j}_crunch ${RD}/crunch/$${j} && \
 		true || { rm -rf $${j}_crunch ; false ; } ; \
 	done
diff --git a/release/picobsd/custom/crunch1/Makefile b/release/picobsd/custom/crunch1/Makefile
index 176e6ae..93882cb 100644
--- a/release/picobsd/custom/crunch1/Makefile
+++ b/release/picobsd/custom/crunch1/Makefile
@@ -22,7 +22,7 @@ crunch: crunch1.mk
 	@cp crunch1.c build/
 	@(cd build && env MAKEOBJDIRPREFIX=${COMMOBJ} \
 	    ${MAKE} -f ../crunch1.mk -DNOPAM all \
-	    "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT") #2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT") #2>&1 >/dev/null
 
 clean:
 	rm -rf build
diff --git a/release/picobsd/custom/crunch2/Makefile b/release/picobsd/custom/crunch2/Makefile
index ce2fada..0e5d141 100644
--- a/release/picobsd/custom/crunch2/Makefile
+++ b/release/picobsd/custom/crunch2/Makefile
@@ -9,7 +9,7 @@ crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch2.conf
 	@crunchgen ./crunch2.conf
 	${MAKE} -f crunch2.mk RELEASE_CRUNCH= -DNOPAM all \
-	    "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT"
+	    "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT"
 
 clean:
 	rm  -f *.o *.stub *.lo *_stub.c *.mkcrunch.cache Make.log *~ 
diff --git a/release/picobsd/install/crunch1/Makefile b/release/picobsd/install/crunch1/Makefile
index a5da442..1fcfcac 100644
--- a/release/picobsd/install/crunch1/Makefile
+++ b/release/picobsd/install/crunch1/Makefile
@@ -13,7 +13,7 @@ crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk -DNOPAM all \
-	    "CFLAGS=${CFLAGS} -DNOPAM -DRELEASE_CRUNCH -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
 #	@if [ -f /usr/src/usr.bin/passwd/.picobsd.patched ]; then \
diff --git a/release/picobsd/router/crunch1/Makefile b/release/picobsd/router/crunch1/Makefile
index 08736da..7af56e7 100644
--- a/release/picobsd/router/crunch1/Makefile
+++ b/release/picobsd/router/crunch1/Makefile
@@ -9,7 +9,7 @@ crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk NOSECURE=yes NOCRYPT=yes all \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DRELEASE_CRUNCH" #2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DRELEASE_CRUNCH" #2>&1 >/dev/null
 
 clean:
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \