From 43475a98c90071ad42f02dfec95e71aeec775119 Mon Sep 17 00:00:00 2001
From: Andre Maroneze <andre.oliveiramaroneze@cea.fr>
Date: Wed, 12 Feb 2020 16:01:06 +0100
Subject: [PATCH] [Makefile] fix 'install' target on Cygwin
---
Makefile | 2 +-
configure.in | 5 +++++
share/Makefile.config.in | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 5136dd9a8b9..b5ada9181cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1878,7 +1878,7 @@ install-lib-byte: clean-install
$(PRINT_INSTALL) kernel API
$(MKDIR) $(FRAMAC_LIBDIR)
$(CP) $(LIB_BYTE_TO_INSTALL) $(FRAMAC_LIBDIR)
- $(CP) $(addprefix lib/fc/,dllframa-c.so libframa-c.a frama-c.cma META.frama-c) $(FRAMAC_LIBDIR)
+ $(CP) $(addprefix lib/fc/,dllframa-c$(DLLEXT) libframa-c.a frama-c.cma META.frama-c) $(FRAMAC_LIBDIR)
install-lib-opt: install-lib-byte
$(CP) $(LIB_OPT_TO_INSTALL) $(FRAMAC_LIBDIR)
diff --git a/configure.in b/configure.in
index 3dc68d9e3a5..e1fd88f4536 100644
--- a/configure.in
+++ b/configure.in
@@ -40,6 +40,7 @@
# OCAMLVERSION the ocaml version number
# OCAMLWIN32 "yes"/"no" depending on Sys.os_type = "Win32"
# EXE ".exe" if OCAMLWIN32=yes, "" otherwise
+# DLLEXT ".dll" if OCAMLWIN32=yes, ".so" otherwise
AC_INIT(src/kernel_internals/runtime/boot.ml)
@@ -411,12 +412,14 @@ if test "$OCAML_OS_TYPE" = "Win32"; then
PLATFORM=Win32
OCAMLWIN32=yes
EXE=.exe
+ DLLEXT=.dll
else
OCAMLWIN32=no
if test "$OCAML_OS_TYPE" = "Cygwin"; then
AC_MSG_RESULT(Cygwin)
PLATFORM=Cygwin
EXE=.exe
+ DLLEXT=.dll
else
if test $(uname -s) = "Darwin"; then
AC_MSG_RESULT(MacOS)
@@ -426,6 +429,7 @@ else
PLATFORM=Unix
fi
EXE=
+ DLLEXT=.so
fi
fi
@@ -989,6 +993,7 @@ AC_SUBST(OCAMLLIB)
AC_SUBST(OCAMLWIN32)
AC_SUBST(OCAML_ANNOT_OPTION)
AC_SUBST(EXE)
+AC_SUBST(DLLEXT)
AC_SUBST(HAVE_STDLIB_H)
AC_SUBST(HAVE_WCHAR_H)
diff --git a/share/Makefile.config.in b/share/Makefile.config.in
index ea46fb652da..096695dadf8 100644
--- a/share/Makefile.config.in
+++ b/share/Makefile.config.in
@@ -90,6 +90,7 @@ HAS_OCAML408 ?=@HAS_OCAML408@
PLATFORM ?=@PLATFORM@
OCAMLWIN32 ?=@OCAMLWIN32@
+DLLEXT ?=@DLLEXT@
DEVELOPMENT ?=@DEVELOPMENT@
--
GitLab