Permalink
Browse files

Use echo -e when needed in the Makefile

Some echo-ed strings in the Makefile contain \r and \c sequence characters.
They are not interpreted by default and require the -e flag to be passed to
echo. This commit adds it everywhere it is needed for a better and more
consistant output during the installation.
  • Loading branch information...
delroth committed Jun 21, 2011
1 parent 894a751 commit fdaaa12bec67c55593cb2dd3340f6a1f7c32aa56
Showing with 13 additions and 13 deletions.
  1. +13 −13 Makefile
View
@@ -66,7 +66,7 @@ distrib: $(MYOCAMLBUILD)
STDLIB_DIR = $(INSTALL_DIR)/lib/opa/stdlib
define install-package
-@echo "Installing into $(STDLIB_DIR)/$*.opx[K\r\c"
+@echo -e "Installing into $(STDLIB_DIR)/$*.opx[K\r\c"
@mkdir -p "$(STDLIB_DIR)/$*.opx/_build"
@find "$(BUILD_DIR)/$*.opx" -maxdepth 1 ! -type d -exec $(INSTALL) {} "$(STDLIB_DIR)/$*.opx/" \;
@$(INSTALL) $(BUILD_DIR)/$*.opx/_build/*.a "$(STDLIB_DIR)/$*.opx/_build/"
@@ -95,40 +95,40 @@ install-package-%:
$(install-package)
install-packages: $(addprefix install-packageopt-,$(OPA_PACKAGES))
- @echo "Installation to $(STDLIB_DIR) done.[K"
+ @echo -e "Installation to $(STDLIB_DIR) done.[K"
install-all-packages: $(addprefix install-package-,$(OPA_PACKAGES))
- @echo "Installation to $(STDLIB_DIR) done.[K"
+ @echo -e "Installation to $(STDLIB_DIR) done.[K"
install-bin:
- @echo "Installing into $(INSTALL_DIR)/bin[K\r\c"
+ @echo -e "Installing into $(INSTALL_DIR)/bin[K\r\c"
@mkdir -p $(INSTALL_DIR)/bin
@$(if $(wildcard $(BUILD_DIR)/bin/*),$(INSTALL) -r $(BUILD_DIR)/bin/* $(INSTALL_DIR)/bin)
@utils/install.sh --quiet --dir $(INSTALL_DIR) --ocamllib $(OCAMLLIB) --ocamlopt $(OCAMLOPT)
- @echo "Installation to $(INSTALL_DIR)/bin done.[K"
+ @echo -e "Installation to $(INSTALL_DIR)/bin done.[K"
install-lib:
- @echo "Installing into $(INSTALL_DIR)/lib/opa[K\r\c"
+ @echo -e "Installing into $(INSTALL_DIR)/lib/opa[K\r\c"
@mkdir -p $(INSTALL_DIR)/lib/opa
@$(if $(wildcard $(BUILD_DIR)/lib/opa/*),$(INSTALL) -r $(BUILD_DIR)/lib/opa/* $(INSTALL_DIR)/lib/opa/)
- @echo "Installation to $(INSTALL_DIR)/lib/opa done.[K"
+ @echo -e "Installation to $(INSTALL_DIR)/lib/opa done.[K"
install-share:
- @echo "Installing into $(INSTALL_DIR)/share/opa[K\r\c"
+ @echo -e "Installing into $(INSTALL_DIR)/share/opa[K\r\c"
@mkdir -p $(INSTALL_DIR)/share/opa
@$(if $(wildcard $(BUILD_DIR)/share/opa/*),$(INSTALL) -r $(BUILD_DIR)/share/opa/* $(INSTALL_DIR)/share/opa/)
- @echo "Installation to $(INSTALL_DIR)/share/opa done.[K"
+ @echo -e "Installation to $(INSTALL_DIR)/share/opa done.[K"
install-doc:
- @echo "Installing into $(INSTALL_DIR)/share/doc/opa[K\r\c"
+ @echo -e "Installing into $(INSTALL_DIR)/share/doc/opa[K\r\c"
@if [ -d $(BUILD_DIR)/opadoc/doc/ ]; then \
mkdir -p $(INSTALL_DIR)/share/doc/opa/api; \
$(INSTALL) -r $(BUILD_DIR)/opadoc/doc/* $(INSTALL_DIR)/share/doc/opa/api; \
fi
- @echo "Installation to $(INSTALL_DIR)/share/doc/opa done.[K"
+ @echo -e "Installation to $(INSTALL_DIR)/share/doc/opa done.[K"
install: install-bin install-lib install-share install-packages install-doc
- @echo "Installation into $(INSTALL_DIR) done.[K"
+ @echo -e "Installation into $(INSTALL_DIR) done.[K"
.PHONY: uninstall
uninstall:
@@ -140,7 +140,7 @@ uninstall:
$(foreach file,$(BUILD_DIR)/bin/*,rm -f $(INSTALL_DIR)/bin/$(notdir $(file));)
@utils/install.sh --uninstall --dir $(INSTALL_DIR)
@[ ! -d $(INSTALL_DIR)/bin ] || [ -n "`ls -A $(INSTALL_DIR)/bin`" ] || rmdir $(INSTALL_DIR)/bin
- @echo "Uninstall done.[K"
+ @echo -e "Uninstall done.[K"
# Install our ocamlbuild-generation engine
install-bld:

0 comments on commit fdaaa12

Please sign in to comment.