From: Carl Worth Date: Thu, 1 Apr 2010 07:07:08 +0000 (-0700) Subject: Makefiles: Align the columns of output. X-Git-Tag: 0.1~25 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c20be126e5e52af9b8cdff5685124e4a867e375a;p=notmuch.git Makefiles: Align the columns of output. Much better. --- diff --git a/Makefile.local b/Makefile.local index 03e32371..9b7423ed 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 3e30cee9..df1636d2 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