Skip to content
Snippets Groups Projects
Commit ce681e6f authored by Virgile Prevosto's avatar Virgile Prevosto
Browse files

Fixes wrong path for files to be included in distribution

`PLUGIN_DISTRIB_EXTERNAL` expects path **relative to the plugin
directory** :rage:
parent e8e96780
No related branches found
No related tags found
No related merge requests found
...@@ -156,7 +156,8 @@ EACSL_LIBDIR := $(EACSL_PLUGIN_DIR)/lib ...@@ -156,7 +156,8 @@ EACSL_LIBDIR := $(EACSL_PLUGIN_DIR)/lib
# DLMALLOC # # DLMALLOC #
############ ############
EACSL_DLMALLOC_DIR := $(EACSL_PLUGIN_DIR)/contrib/libdlmalloc EACSL_DLMALLOC_REL_DIR := contrib/libdlmalloc
EACSL_DLMALLOC_DIR := $(EACSL_PLUGIN_DIR)/$(EACSL_DLMALLOC_REL_DIR)
EACSL_DLMALLOC_LIBNAME = libeacsl-dlmalloc.a EACSL_DLMALLOC_LIBNAME = libeacsl-dlmalloc.a
EACSL_DLMALLOC_LIB = $(EACSL_LIBDIR)/$(EACSL_DLMALLOC_LIBNAME) EACSL_DLMALLOC_LIB = $(EACSL_LIBDIR)/$(EACSL_DLMALLOC_LIBNAME)
EACSL_DLMALLOC_SRC = $(EACSL_DLMALLOC_DIR)/dlmalloc.c EACSL_DLMALLOC_SRC = $(EACSL_DLMALLOC_DIR)/dlmalloc.c
...@@ -184,7 +185,8 @@ $(EACSL_DLMALLOC_LIB): $(EACSL_DLMALLOC_SRC) ...@@ -184,7 +185,8 @@ $(EACSL_DLMALLOC_LIB): $(EACSL_DLMALLOC_SRC)
# GMP # # GMP #
############ ############
EACSL_GMP_DIR := $(EACSL_PLUGIN_DIR)/contrib/libgmp EACSL_GMP_REL_DIR:=contrib/libgmp
EACSL_GMP_DIR := $(EACSL_PLUGIN_DIR)/$(EACSL_GMP_REL_DIR)
EACSL_GMP_LIBNAME = libeacsl-gmp.a EACSL_GMP_LIBNAME = libeacsl-gmp.a
EACSL_GMP_LIB = $(EACSL_LIBDIR)/$(EACSL_GMP_LIBNAME) EACSL_GMP_LIB = $(EACSL_LIBDIR)/$(EACSL_GMP_LIBNAME)
EACSL_GMP_OBJ = mini-gmp.o EACSL_GMP_OBJ = mini-gmp.o
...@@ -230,9 +232,9 @@ EACSL_OCAML_FILES = $(wildcard *.mli) \ ...@@ -230,9 +232,9 @@ EACSL_OCAML_FILES = $(wildcard *.mli) \
$(filter-out $(wildcard *local_config.ml), $(wildcard *.ml)) $(filter-out $(wildcard *local_config.ml), $(wildcard *.ml))
EACSL_CONTRIB_FILES = \ EACSL_CONTRIB_FILES = \
$(EACSL_GMP_DIR)/mini-gmp.c \ $(EACSL_GMP_REL_DIR)/mini-gmp.c \
$(EACSL_GMP_DIR)/mini-gmp.h \ $(EACSL_GMP_REL_DIR)/mini-gmp.h \
$(EACSL_DLMALLOC_DIR)/dlmalloc.c $(EACSL_DLMALLOC_REL_DIR)/dlmalloc.c
EACSL_MANUAL_FILES = $(wildcard $(E_ACSL_DIR)/doc/manuals/*.pdf) EACSL_MANUAL_FILES = $(wildcard $(E_ACSL_DIR)/doc/manuals/*.pdf)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment