aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhattenberger2013-05-01 22:48:38 +0000
committerhattenberger2013-05-01 22:48:38 +0000
commita87835178bec762ca9956f067de750178f9822fa (patch)
tree2584c5e3aa2227f81b1fb189ff17f3d127ef041e
parent828558279a8209cbc4d8f84eb2ec15f517b623d4 (diff)
downloadivy-ocaml-a87835178bec762ca9956f067de750178f9822fa.zip
ivy-ocaml-a87835178bec762ca9956f067de750178f9822fa.tar.gz
ivy-ocaml-a87835178bec762ca9956f067de750178f9822fa.tar.bz2
ivy-ocaml-a87835178bec762ca9956f067de750178f9822fa.tar.xz
fix install target to properly clean up after failed install
-rw-r--r--Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index cd6ac8b..f0eb4f3 100644
--- a/Makefile
+++ b/Makefile
@@ -96,12 +96,8 @@ IVY_INST_FILES = $(IVYCMI) $(IVYMLI) $(IVYCMX) $(IVY_ALL_LIBS)
GLIBIVY_INST_FILES = glibIvy.mli glibIvy.cmi glibIvy.cmx $(GLIBIVY_ALL_LIBS)
install : $(LIBS)
- mv META.ivy META
- ocamlfind install $(OCAMLFINDFLAGS) ivy META $(IVY_INST_FILES)
- mv META META.ivy
- mv META.glibivy META
- ocamlfind install $(OCAMLFINDFLAGS) glibivy META $(GLIBIVY_INST_FILES)
- mv META META.glibivy
+ mv META.ivy META && ocamlfind install $(OCAMLFINDFLAGS) ivy META $(IVY_INST_FILES) && mv META META.ivy || (mv META META.ivy && exit 1)
+ mv META.glibivy META && ocamlfind install $(OCAMLFINDFLAGS) glibivy META $(GLIBIVY_INST_FILES) && mv META META.glibivy || (mv META META.glibivy && exit 1)
ifeq ($(COMPAT_SYMLINK_CREATE), y)
# make some symlinks for backwards compatibility
@echo "Creating symlinks for backwards compatibility..."