summaryrefslogtreecommitdiff
path: root/otherlibs
diff options
context:
space:
mode:
authorSébastien Hinderer <Sebastien.Hinderer@inria.fr>2018-09-12 16:32:44 +0200
committerSébastien Hinderer <Sebastien.Hinderer@inria.fr>2018-09-17 14:23:35 +0200
commitba6362a07d3445c2f4ee3dfe4f8585d8d4f7e1b7 (patch)
tree897dc68713ef684c03f0fcff2df78a7426790602 /otherlibs
parent7b28143ecbfa8ed59a2998510e3be63b07f055fa (diff)
downloadocaml-ba6362a07d3445c2f4ee3dfe4f8585d8d4f7e1b7.tar.gz
Move config/Makefile to Makefile.config
In order to prepare the transition to autoconf, this commit moves the configuration Makefile out of the config directory which will disappear and gives it the name it will have once intstalled, namely Makefile.config.
Diffstat (limited to 'otherlibs')
-rw-r--r--otherlibs/Makefile2
-rw-r--r--otherlibs/dynlink/Makefile2
-rw-r--r--otherlibs/systhreads/Makefile2
-rw-r--r--otherlibs/threads/Makefile2
4 files changed, 4 insertions, 4 deletions
diff --git a/otherlibs/Makefile b/otherlibs/Makefile
index 58a9800995..5659f689cc 100644
--- a/otherlibs/Makefile
+++ b/otherlibs/Makefile
@@ -16,7 +16,7 @@
# Common Makefile for otherlibs
ROOTDIR=../..
-include $(ROOTDIR)/config/Makefile
+include $(ROOTDIR)/Makefile.config
include $(ROOTDIR)/Makefile.common
CAMLRUN ?= $(ROOTDIR)/boot/ocamlrun
diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile
index ef6e1efa1f..09e796f967 100644
--- a/otherlibs/dynlink/Makefile
+++ b/otherlibs/dynlink/Makefile
@@ -17,7 +17,7 @@
# FIXME reduce redundancy by including ../Makefile
-include ../../config/Makefile
+include ../../Makefile.config
include ../../Makefile.common
CAMLRUN ?= ../../boot/ocamlrun
diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile
index 8d4c99c46b..7569ebcea3 100644
--- a/otherlibs/systhreads/Makefile
+++ b/otherlibs/systhreads/Makefile
@@ -15,7 +15,7 @@
ROOTDIR=../..
-include $(ROOTDIR)/config/Makefile
+include $(ROOTDIR)/Makefile.config
include $(ROOTDIR)/Makefile.common
CAMLRUN ?= $(ROOTDIR)/boot/ocamlrun
diff --git a/otherlibs/threads/Makefile b/otherlibs/threads/Makefile
index 7753e8b23c..325fd4a7e0 100644
--- a/otherlibs/threads/Makefile
+++ b/otherlibs/threads/Makefile
@@ -15,7 +15,7 @@
# FIXME reduce redundancy by including ../Makefile
-include ../../config/Makefile
+include ../../Makefile.config
include ../../Makefile.common
CAMLRUN ?= ../../boot/ocamlrun