summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2010-04-01 00:07:08 -0700
committerCarl Worth <cworth@cworth.org>2010-04-01 00:07:08 -0700
commitc20be126e5e52af9b8cdff5685124e4a867e375a (patch)
treeed8084c02ba1ea2302d692f8adb376bc7b520577
parent33d5cc415ec31d14f126dbb19f8538b04d2c1b49 (diff)
Makefiles: Align the columns of output.
Much better.
-rw-r--r--Makefile.local12
-rwxr-xr-xconfigure4
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.local b/Makefile.local
index 03e3237..9b7423e 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -38,21 +38,21 @@ endif
# user how to enable verbose compiles.
ifeq ($(V),)
quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
-quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)" $1 $2 $@\n"; $($1)
-quiet_args = @printf $(quiet_DOC)$(eval quiet_DOC:=)" $1 $2\n"; $($1) $2
+quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)" %12s $@\n" "$1 $2"; $($1)
+quiet_args = @printf $(quiet_DOC)$(eval quiet_DOC:=)" %12s$2\n" $1; $($1) $2
endif
# The user has explicitly enabled quiet compilation.
ifeq ($(V),0)
-quiet = @printf " $1 $2 $@\n"; $($1)
-quiet_args = @printf " $1 $2\n"; $($1) $2
+quiet = @printf " %12s $@\n" "$1 $2"; $($1)
+quiet_args = @printf " %12s$2\n" $1; $($1) $2
endif
# Otherwise, print the full command line.
quiet ?= $($1)
quiet_args ?= $($1) $2
quiet_mkdir = $(call quiet_args,MKDIR,$1)
-quiet_install_bin = $(call quiet_args,INSTBIN,$1)
-quiet_install_data = $(call quiet_args,INSTDATA,$1)
+quiet_install_bin = $(call quiet_args,INSTALL-BIN,$1)
+quiet_install_data = $(call quiet_args,INSTALL-DATA,$1)
quiet_symlink = $(call quiet_args,SYMLINK,$1)
%.o: %.cc $(global_deps)
diff --git a/configure b/configure
index 3e30cee..df1636d 100755
--- a/configure
+++ b/configure
@@ -286,10 +286,10 @@ gzip = gzip
MKDIR = install -d
# Command to install an executable
-INSTBIN = install
+INSTALL-BIN = install
# Command to install a non-executable file (documentation, etc.)
-INSTDATA = install -m0644
+INSTALL-DATA = install -m0644
# Command to create a symbolic link
SYMLINK = ln -sf