aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <fredrik@erlang.org>2013-10-09 10:59:24 +0200
committerFredrik Gustafsson <fredrik@erlang.org>2013-10-09 10:59:24 +0200
commitc8b667f1bd37e3b4715e98b3b571355c66e75961 (patch)
tree558c7c5cca3c1b90a8bb881c8c61b0e12218c0e3
parent5ee95f1f10f879a9caec67248c27e74dacbf276d (diff)
parentf584c3d4e211c4d2619618977cd45ca3db1d69df (diff)
downloadotp-c8b667f1bd37e3b4715e98b3b571355c66e75961.tar.gz
otp-c8b667f1bd37e3b4715e98b3b571355c66e75961.tar.bz2
otp-c8b667f1bd37e3b4715e98b3b571355c66e75961.zip
Merge branch 'maint'
-rw-r--r--erts/etc/unix/Makefile2
-rw-r--r--lib/ic/c_src/Makefile.in6
2 files changed, 3 insertions, 5 deletions
diff --git a/erts/etc/unix/Makefile b/erts/etc/unix/Makefile
index e85d2fab0c..c137a31ec2 100644
--- a/erts/etc/unix/Makefile
+++ b/erts/etc/unix/Makefile
@@ -29,7 +29,7 @@ opt debug: etc
etc: etp-commands
etp-commands: etp-commands.in
- sed 's:@ERL_TOP@:${ERL_TOP}:g' etp-commands.in > etp-commands
+ $(gen_verbose)sed 's:@ERL_TOP@:${ERL_TOP}:g' etp-commands.in > etp-commands
.PHONY: docs
docs:
diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
index 6e65f06114..ed860ab73b 100644
--- a/lib/ic/c_src/Makefile.in
+++ b/lib/ic/c_src/Makefile.in
@@ -132,10 +132,8 @@ docs:
_create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
$(LIBRARY): $(OBJ_FILES)
- $(ar_verbose)
- -$(AR) $(AR_OUT) $@ $(OBJ_FILES)
- $(ranlib_verbose)
- -$(RANLIB) $@
+ -$(V_AR) $(AR_OUT) $@ $(OBJ_FILES)
+ -$(V_RANLIB) $@
$(OBJDIR)/%.o: %.c
$(V_CC) $(CC_FLAGS) -c -o $@ $(ALL_CFLAGS) $<