From 84704eb6eaebf19425ccb941388f2258282e4d73 Mon Sep 17 00:00:00 2001
From: "Steffen (Daode) Nurpmeso" <steffen@sdaoden.eu>
Date: Wed, 31 Aug 2016 12:41:29 +0200
Subject: [PATCH] mk-conf.sh, mk-mk.in: tiny steps

---
 mk-conf.sh | 18 +++++++++---------
 mk-mk.in   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mk-conf.sh b/mk-conf.sh
index c25494bc9..1b7c5fc77 100644
--- a/mk-conf.sh
+++ b/mk-conf.sh
@@ -293,7 +293,7 @@ cc_setup() {
          printf >&2 'boing booom tschak\n'
          msg 'ERROR: I cannot find a compiler!'
          msg ' Neither of clang(1), gcc(1), tcc(1), pcc(1), c89(1) and c99(1).'
-         msg ' Please set $CC environment variable, maybe $CFLAGS also, rerun.'
+         msg ' Please set ${CC} environment variable, maybe ${CFLAGS}, rerun.'
          config_exit 1
       fi
    fi
@@ -310,7 +310,7 @@ _cc_default() {
    if [ -z "${VERBOSE}" ] && [ -f ${lst} ] && feat_no DEBUG; then
       :
    else
-      msg 'Using C compiler $CC="%s"' "${CC}"
+      msg 'Using C compiler ${CC}=%s' "${CC}"
    fi
 }
 
@@ -318,10 +318,11 @@ cc_flags() {
    if feat_yes AUTOCC; then
       if [ -f ${lst} ] && feat_no DEBUG && [ -z "${VERBOSE}" ]; then
          cc_check_silent=1
-         msg 'Detecting $CFLAGS/$LDFLAGS for $CC="%s", just a second..' "${CC}"
+         msg 'Detecting ${CFLAGS}/${LDFLAGS} for ${CC}="%s", just a second..' \
+            "${CC}"
       else
          cc_check_silent=
-         msg 'Testing usable $CFLAGS/$LDFLAGS for $CC="%s"' "${CC}"
+         msg 'Testing usable ${CFLAGS}/${LDFLAGS} for ${CC}=%s' "${CC}"
       fi
 
       i=`echo "${CC}" | ${awk} 'BEGIN{FS="/"}{print $NF}'`
@@ -528,7 +529,7 @@ check_tool() {
    # Evaluate, just in case user comes in with shell snippets (..well..)
    eval i="${i}"
    if type "${i}" >/dev/null 2>&1; then # XXX why have i type not command -v?
-      [ -n "${VERBOSE}" ] && msg ' . $%s ... "%s"' "${n}" "${i}"
+      [ -n "${VERBOSE}" ] && msg ' . ${%s} ... %s' "${n}" "${i}"
       eval ${n}=${i}
       return 0
    fi
@@ -983,12 +984,11 @@ echo "${INCS}" > ${inc}
 ${cat} > ${makefile} << \!
 .SUFFIXES: .o .c .x .y
 .c.o:
-	$(CC) -I./ $(XINCS) $(CFLAGS) -c $<
+	$(CC) -I./ $(XINCS) $(CFLAGS) -c $(<)
 .c.x:
-	$(CC) -I./ $(XINCS) -E $< >$@
+	$(CC) -I./ $(XINCS) -E $(<) > $(@)
 .c:
-	$(CC) -I./ $(XINCS) $(CFLAGS) $(LDFLAGS) -o $@ $< $(XLIBS)
-.y: ;
+	$(CC) -I./ $(XINCS) $(CFLAGS) $(LDFLAGS) -o $(@) $(<) $(XLIBS)
 !
 
 _check_preface() {
diff --git a/mk-mk.in b/mk-mk.in
index d1211b5cb..98528514f 100644
--- a/mk-mk.in
+++ b/mk-mk.in
@@ -12,7 +12,7 @@ OBJ = $(OBJ_SRC:.c=.o)
 .SUFFIXES: .o .c .y
 .c.o:
 	$(ECHO_CC)$(CC) $(CFLAGS) $(INCS) -c $(<)
-.c .y: ;
+.c: ;
 
 all: $(UAGENT) $(OPTIONAL_PRIVSEP)
 
-- 
2.11.4.GIT