Skip to content

Commit

Permalink
[cleanup] Makefile: replaced calls to 'pwd' with make builtin command…
Browse files Browse the repository at this point in the history
… 'realpath'
  • Loading branch information
Mathieu Baudet committed Jan 6, 2012
1 parent 8c3019b commit 01242f2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -48,7 +48,7 @@ runtime-libs: $(MYOCAMLBUILD)
$(BUILD_DIR)/bin/opa: $(MYOCAMLBUILD)
$(OCAMLBUILD) opa-packages.stamp $(target-tool-opa-bin)
@$(copy-tool-opa-bin)
@utils/install.sh --quiet --dir $(PWD)/$(BUILD_DIR) --ocaml-prefix $(OCAMLLIB)/../..
@utils/install.sh --quiet --dir $(realpath $(BUILD_DIR)) --ocaml-prefix $(OCAMLLIB)/../..

.PHONY: opa
opa: $(BUILD_DIR)/bin/opa
Expand Down Expand Up @@ -255,9 +255,9 @@ book:
examples: $(MYOCAMLBUILD)
$(OCAMLBUILD) $(call target-tools,opa-bin opa-plugin-builder-bin) opa-packages.stamp
$(call copy-tools,opa-bin opa-plugin-builder-bin)
MLSTATELIBS=`pwd`/$(BUILD_DIR) \
OPA="`pwd`/$(BUILD_DIR)/lib/opa/bin/opa-bin -I `pwd`/$(BUILD_DIR)" \
OPA_PLUGIN_BUILDER=`pwd`/$(BUILD_DIR)/lib/opa/bin/opa-plugin-builder-bin \
MLSTATELIBS=$(realpath $(BUILD_DIR)) \
OPA="$(realpath $(BUILD_DIR))/lib/opa/bin/opa-bin -I $(realpath $(BUILD_DIR))" \
OPA_PLUGIN_BUILDER=$(realpath $(BUILD_DIR))/lib/opa/bin/opa-plugin-builder-bin \
$(MAKE) -C doc/book examples

.PHONY: book-clean
Expand Down

0 comments on commit 01242f2

Please sign in to comment.