diff options
| author | hattenberger | 2013-05-01 22:48:40 +0000 |
|---|---|---|
| committer | hattenberger | 2013-05-01 22:48:40 +0000 |
| commit | 7fae936e59d5c4a446e0c1e92e6d2df4fac5c37d (patch) | |
| tree | d1a28583b99a9838729dfecc8dd0640bf5f3d0a6 | |
| parent | a87835178bec762ca9956f067de750178f9822fa (diff) | |
| download | ivy-ocaml-7fae936e59d5c4a446e0c1e92e6d2df4fac5c37d.zip ivy-ocaml-7fae936e59d5c4a446e0c1e92e6d2df4fac5c37d.tar.gz ivy-ocaml-7fae936e59d5c4a446e0c1e92e6d2df4fac5c37d.tar.bz2 ivy-ocaml-7fae936e59d5c4a446e0c1e92e6d2df4fac5c37d.tar.xz | |
fix install with COMPAT_SYMLINK_CREATE=no
also install ivy.mli|cmi|cmx to glibivy
| -rw-r--r-- | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -59,12 +59,14 @@ GLIBIVY = ivy.ml glibIvy.ml GLIBIVYCMO= $(GLIBIVY:.ml=.cmo) GLIBIVYCMI= $(GLIBIVY:.ml=.cmi) +GLIBIVYMLI= $(GLIBIVY:.ml=.mli) GLIBIVYCMX= $(GLIBIVY:.ml=.cmx) TKIVY = ivy.ml tkIvy.ml TKIVYCMO= $(TKIVY:.ml=.cmo) TKIVYCMI= $(TKIVY:.ml=.cmi) +TKIVYMLI= $(TKIVY:.ml=.mli) TKIVYCMX= $(TKIVY:.ml=.cmx) @@ -77,8 +79,6 @@ GLIBIVYSTATIC = libglibivy-ocaml.a glibivy-ocaml.a LIBS = ivy-ocaml.cma glibivy-ocaml.cma XLIBS = ivy-ocaml.cmxa glibivy-ocaml.cmxa -GLIBIVYCMI = glibIvy.cmi - all : $(LIBS) $(XLIBS) @@ -92,8 +92,8 @@ tkivy : $(TKLIBS) IVY_ALL_LIBS = ivy-ocaml.cma ivy-ocaml.cmxa libivy-ocaml.a ivy-ocaml.a dllivy-ocaml.so GLIBIVY_ALL_LIBS = glibivy-ocaml.cma glibivy-ocaml.cmxa libglibivy-ocaml.a glibivy-ocaml.a dllglibivy-ocaml.so -IVY_INST_FILES = $(IVYCMI) $(IVYMLI) $(IVYCMX) $(IVY_ALL_LIBS) -GLIBIVY_INST_FILES = glibIvy.mli glibIvy.cmi glibIvy.cmx $(GLIBIVY_ALL_LIBS) +IVY_INST_FILES = $(IVYMLI) $(IVYCMI) $(IVYCMX) $(IVY_ALL_LIBS) +GLIBIVY_INST_FILES = $(GLIBIVYMLI) $(GLIBIVYCMI) $(GLIBIVYCMX) $(GLIBIVY_ALL_LIBS) install : $(LIBS) mv META.ivy META && ocamlfind install $(OCAMLFINDFLAGS) ivy META $(IVY_INST_FILES) && mv META META.ivy || (mv META META.ivy && exit 1) @@ -102,9 +102,9 @@ ifeq ($(COMPAT_SYMLINK_CREATE), y) # make some symlinks for backwards compatibility @echo "Creating symlinks for backwards compatibility..." $(foreach file,$(IVYLIBS) $(IVYSTATIC) $(IVYCMI) $(IVYMLI), \ - cd $(DESTDIR)/`ocamlc -where`; ln -s $(COMPAT_SYMLINK_SRCMOD)ivy/$(file) $(file);) - $(foreach file,$(GLIBIVYLIBS) $(GLIBIVYSTATIC) $(GLIBIVYCMI), \ - cd $(DESTDIR)/`ocamlc -where`; ln -s $(COMPAT_SYMLINK_SRCMOD)glibivy/$(file) $(file);) + cd $(DESTDIR)/`ocamlc -where`; ln -fs $(COMPAT_SYMLINK_SRCMOD)ivy/$(file) $(file);) + $(foreach file,$(GLIBIVYLIBS) $(GLIBIVYSTATIC) glibIvy.cmi, \ + cd $(DESTDIR)/`ocamlc -where`; ln -fs $(COMPAT_SYMLINK_SRCMOD)glibivy/$(file) $(file);) endif uninstall : |