m fixesHEADmaster

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 88 insertions, 99 deletions

diff --git a/mk/tools.mk b/mk/tools.mk
index 0fc68bf..c675c3f 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -10,145 +10,134 @@
 
 
 # Part of GNU Coreutils:
-BASENAME ?= basename
-CHGRP ?= chgrp
-CHMOD ?= chmod
-CHOWN ?= chown
-CP ?= cp
-CPLIT ?= cplit
-CUT ?= cut
-DATE ?= date
-DIRNAME ?= dirname
-ECHO ?= echo
-ENV ?= env
-EXPAND ?= expand
-EXPR ?= expr
-FALS ?= false
-FMT ?= fmt
-FOLD ?= fold
-HEAD ?= head
-INSTALL ?= install
-INSTALL_DATA ?= $(INSTALL) -m644
-INSTALL_DIR ?= $(INSTALL) -dm755
-INSTALL_PROGRAM ?= $(INSTALL) -m755
-JOIN ?= join
-LN ?= ln
-MKDIR ?= mkdir
-MKFIFO ?= mkfifo
-MKNOD ?= mknod
-MV ?= mv
-NL ?= nl
-NPROC ?= nproc
-NUMFMT ?= numfmt
-OD ?= od
-PASTE ?= paste
-PATHCHK ?= pathchk
-PR ?= pr
-PRINTF ?= printf
-READLINK ?= readlink
-REALPATH ?= realpath
-RM ?= rm
-RMDIR ?= rmdir
-SEQ ?= seq
-SLEEP ?= sleep
-SORT ?= sort
-SPLIT ?= split
-STAT ?= stat
-TAC ?= tac
-TAIL ?= tail
-TEE ?= tee
-TEST ?= test
-TOUCH ?= touch
-TR ?= tr
-TRUE ?= true
-TRUNCATE ?= truncate
-TSORT ?= tsort
-UNAME ?= uname
-UNEXPAND ?= unexpand
-UNIQ ?= uniq
-WC ?= wc
-YES ?= yes
+BASENAME = basename
+CHGRP = chgrp
+CHMOD = chmod
+CHOWN = chown
+CP = cp
+CUT = cut
+DATE = date
+DIRNAME = dirname
+ECHO = echo
+ENV = env
+EXPAND = expand
+EXPR = expr
+FALS = false
+FMT = fmt
+FOLD = fold
+HEAD = head
+INSTALL = install
+INSTALL_DATA = $(INSTALL) -m644
+INSTALL_DIR = $(INSTALL) -dm755
+INSTALL_PROGRAM = $(INSTALL) -m755
+JOIN = join
+LN = ln
+MKDIR = mkdir
+MKFIFO = mkfifo
+MKNOD = mknod
+MV = mv
+NL = nl
+OD = od
+PASTE = paste
+PATHCHK = pathchk
+PR = pr
+PRINTF = printf
+RM = rm
+RMDIR = rmdir
+SORT = sort
+SPLIT = split
+TAIL = tail
+TEE = tee
+TEST = test
+TOUCH = touch
+TR = tr
+TRUE = true
+UNAME = uname
+UNEXPAND = unexpand
+UNIQ = uniq
+WC = wc
+YES = yes
 
 # Part of GNU help2man:
-HELP2MAN ?= help2man
+HELP2MAN = help2man
 
 # Part of GNU tar:
-TAR ?= tar
+TAR = tar
 
 # Part of GNU Findutils:
-FIND ?= find
-XARGS ?= xargs
+FIND = find
+XARGS = xargs
 
 # Part of GNU Grep:
-GREP ?= grep
-EGREP ?= egrep
-FGREP ?= fgrep
+GREP = grep
+EGREP = egrep
+FGREP = fgrep
 
 # Part of GNU Sed:
-SED ?= sed
+SED = sed
 
 # Part of GNU Privacy Guard:
-GPG ?= gpg
+GPG = gpg
 
 # Part of Texinfo:
-MAKEINFO ?= makeinfo
-MAKEINFO_HTML ?= $(MAKEINFO) --html
-INSTALL_INFO ?= install-info
+MAKEINFO = makeinfo
+MAKEINFO_HTML = $(MAKEINFO) --html
+INSTALL_INFO = install-info
 
 # Part of Texlive-plainextra:
-TEXI2PDF ?= texi2pdf
-TEXI2DVI ?= texi2dvi
-TEXI2PS ?= texi2pdf --ps
+TEXI2PDF = texi2pdf
+TEXI2DVI = texi2dvi
+TEXI2PS = texi2pdf --ps
 
 # Part of Texlive-core:
-PS2EPS ?= ps2eps
+PS2EPS = ps2eps
 
 # Part of librsvg:
-RSVG_CONVERT ?= rsvg-convert
-SVG2PS ?= $(RSVG_CONVERT) --format=ps
-SVG2PDF ?= $(RSVG_CONVERT) --format=pdf
+RSVG_CONVERT = rsvg-convert
+SVG2PS = $(RSVG_CONVERT) --format=ps
+SVG2PDF = $(RSVG_CONVERT) --format=pdf
 
 # Part of GNU Compiler Collection:
-CC ?= cc
-CPP ?= cpp
-CXX ?= c++
+CC = cc
+CPP = cpp
+CXX = c++
 
 # Part of GNU Binutils:
-AR ?= ar
-LD ?= ld
-RANLIB ?= ranlib
+AR = ar
+LD = ld
+RANLIB = ranlib
 
 # Part of GNU Bison:
-BISON ?= bison
-YACC ?= yacc
+BISON = bison
+YACC = yacc
 
 # Part of Flex:
-FLEX ?= FLEX
-LEX ?= lex
+FLEX = flex
+LEX = lex
 
 # Part of GNU C Library:
-LDCONFIG ?= ldconfig
+LDCONFIG = ldconfig
 
 # Part of GNU Gettext:
-XGETTEXT ?= xgettext
-MSGFMT ?= msgfmt
-MSGMERGE ?= msgmerge
-MSGINIT ?= msginit
+XGETTEXT = xgettext
+MSGFMT = msgfmt
+MSGMERGE = msgmerge
+MSGINIT = msginit
 
 # Part of gzip:
-GZIP ?= gzip
-GZIP_COMPRESS ?= $(GZIP) -k9
+GZIP = gzip
+GZIP_COMPRESS = $(GZIP) -k9
 
 # Part of bzip2:
-BZIP2 ?= bzip2
-BZIP2_COMPRESS ?= $(BZIP2) -k9
+BZIP2 = bzip2
+BZIP2_COMPRESS = $(BZIP2) -k9
 
 # Part of xz:
-XZ ?= xz
-XZ_COMPRESS ?= $(XZ) -ke9
+XZ = xz
+XZ_COMPRESS = $(XZ) -ke9
 
 # Part of auto-auto-complete:
-AUTO_AUTO_COMPLETE ?= auto-auto-complete
+AUTO_AUTO_COMPLETE = auto-auto-complete
 
 
 # Change to $(TRUE) to suppress the bold red and blue output.