Fix how Makefile.simple and custom/Makefile.simple are formed

Makefile.simple

@@ -4,7 +4,7 @@
 #
 # Copyright (C) 1999-2018,2021  Landon Curt Noll
 #
-# SRC: non-GNU Makefile via make -f Makefile.simple Makefile.simple
+# SRC: non-GNU Makefile via
 #
 #	The "# SRC: ... - ..." comment line above indicates
 #	the origin of this file.
@@ -1176,6 +1176,7 @@ HOSTNAME= hostname
 LANG= C
 LDCONFIG= ldconfig
 LN= ln
+LS= ls
 MAKE= make
 MAKEDEPEND= makedepend
 MKDIR= mkdir
@@ -1589,6 +1590,7 @@ CUSTOM_PASSDOWN=  \
     CUSTOMINCDIR="${CUSTOMINCDIR}" \
     DEBUG="${DEBUG}" \
     DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \
+    DIFF="${DIFF}" \
     E="${E}" \
     FMT=${FMT} \
     GREP=${GREP} \
@@ -1605,6 +1607,7 @@ CUSTOM_PASSDOWN=  \
     LIBCUSTCALC_SHLIB="${LIBCUSTCALC_SHLIB}" \
     LIBDIR="${LIBDIR}" \
     LN=${LN} \
+    LS=${LS} \
     MAKE=${MAKE} \
     MAKEDEPEND=${MAKEDEPEND} \
     MAKE_FILE=Makefile \
@@ -3373,7 +3376,7 @@ calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE} ${LOC_MKF}
 	${Q} echo '/*' > $@
 	${Q} echo ' * DO NOT EDIT' >> $@
 	${Q} echo ' *' >> $@
-	${Q} echo ' * generated by calcerr.tbl via Makefile' >> $@
+	${Q} echo ' * generated by calcerr.tbl via Makefile.simple' >> $@
 	${Q} echo ' */' >> $@
 	${Q} echo '' >> $@
 	${Q} echo '' >> $@
@@ -3403,7 +3406,7 @@ calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE} ${LOC_MKF}
 	${Q} echo '/*' > $@
 	${Q} echo ' * DO NOT EDIT' >> $@
 	${Q} echo ' *' >> $@
-	${Q} echo ' * generated by calcerr.tbl via Makefile' >> $@
+	${Q} echo ' * generated by calcerr.tbl via Makefile.simple' >> $@
 	${Q} echo ' */' >> $@
 	${Q} echo '' >> $@
 	${Q} ${SED} -f calcerr_c.sed < calcerr.tbl | \
@@ -3909,7 +3912,13 @@ Makefile.simple: Makefile custom/Makefile.simple
 	    Makefile | \
 	    ${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/' \
 		   -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
-		   -e 's;via$$;via ${MAKE} -f $@ $@;' > $@
+		   -e '/^ifeq /d' \
+		   -e '/^ifneq /d' \
+		   -e '/^ifdef /d' \
+		   -e '/^ifndef /d' \
+		   -e '/^else/d' \
+		   -e '/^endif/d' \
+		   -e 's;via Makefile.simple'"'"';via $@'"'"';' > $@
 	-${Q} if [ -s $@.bak ]; then \
 	    if ${CMP} -s $@.bak $@; then \
 		echo 'top level $@ was already up to date'; \
@@ -3918,10 +3927,13 @@ Makefile.simple: Makefile custom/Makefile.simple
 	    else \
 		echo 'old $@ is now $@.bak'; \
 		echo 'updated top level $@ formed'; \
-		echo 'try: diff -u $@.bak $@'; \
-	    fi; \
+		${DIFF} -u $@.bak $@; \
+	    fi \
 	else \
 	    echo 'new top level $@ formed'; \
+	    echo; \
+	    ${LS} -l $@; \
+	    echo; \
 	fi
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
@@ -4895,6 +4907,12 @@ uninstall: custom/Makefile
 	 fi
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
+# unbak - remove any .bak files that may have been created
+#
+unbak:
+	${Q} ${RM} -f -v Makefile.bak Makefile.simple.bak
+	${Q} ${RM} -f -v custom/Makefile.bak custom/Makefile.simple.bak
+
 # splint - A tool for statically checking C programs
 #
 splint: #hsrc
@@ -6501,4 +6519,3 @@ zrandom.o: value.h
 zrandom.o: zmath.h
 zrandom.o: zrandom.c
 zrandom.o: zrandom.h
-endif