From da5db5087a8d07c1eaf3cc53d479c1cc59740cf1 Mon Sep 17 00:00:00 2001 From: ygrek Date: Mon, 19 Aug 2024 21:13:56 -0400 Subject: [PATCH] build: disable automatic autoconf --- Developers.txt | 2 ++ config/Makefile.in | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Developers.txt b/Developers.txt index 466870aea..b9b6b49c8 100644 --- a/Developers.txt +++ b/Developers.txt @@ -1 +1,3 @@ See docs/developers/Developers.txt + +To regenerate `configure` (after `configure.in` changes) do `cd config && autoconf` diff --git a/config/Makefile.in b/config/Makefile.in index d7d29ef53..f6734a4a7 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -273,17 +273,14 @@ COMMON_CLIENT_SRCS= \ all: Makefile config/Makefile.config $(TARGET_TYPE) -config/configure: config/configure.in - cd config; autoconf - ifeq ("$(CONFIGURE_RUN)" , "yes") -config/Makefile.config: config/configure config/Makefile.config.in $(LIB)/autoconf.ml.new.in packages/rpm/Makefile.in +config/Makefile.config: config/Makefile.config.in $(LIB)/autoconf.ml.new.in packages/rpm/Makefile.in ./configure $(CONFIGURE_ARGUMENTS) else -config/Makefile.config: Makefile config/configure config/Makefile.config.in +config/Makefile.config: Makefile config/Makefile.config.in @echo '******************************************' @echo @echo @@ -1531,7 +1528,6 @@ distclean: releaseclean maintainerclean: distclean echo rm -f $(GUI_CODE)/gui.ml $(GUI_CODE)/gui_zog.ml - rm -f config/configure rm -f Makefile .PHONY: TAGS clean tmpclean moreclean releaseclean distclean maintainerclean ocamldoc_html