about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile24
1 files changed, 14 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 2e2a8af06c..36ba5d60fe 100644
--- a/Makefile
+++ b/Makefile
@@ -30,29 +30,33 @@ include Makeconfig
 .PHONY: all
 all: lib others
 
+ifneq ($(AUTOCONF),no)
+
 ifeq ($(with-cvs),yes)
-define autoconf-it
-@-rm -f $@.new
-autoconf $(ACFLAGS) $< > $@.new
-chmod a-w,a+x $@.new
-mv -f $@.new $@
+define autoconf-it-cvs
 test ! -d CVS || cvs $(CVSOPTS) commit -m'Regenerated: autoconf $(ACFLAGS) $<' $@
 endef
 else
+autoconf-it-cvs =
+endif
+
 define autoconf-it
 @-rm -f $@.new
-autoconf $(ACFLAGS) $< > $@.new
+$(AUTOCONF) $(ACFLAGS) $< > $@.new
 chmod a-w,a+x $@.new
 mv -f $@.new $@
+$(autoconf-it-cvs)
 endef
-endif
-
-# We don't want to run anything here in parallel.
-.NOTPARALLEL:
 
 configure: configure.in aclocal.m4; $(autoconf-it)
 %/configure: %/configure.in aclocal.m4; $(autoconf-it)
 
+endif # $(AUTOCONF) = no
+
+
+# We don't want to run anything here in parallel.
+.NOTPARALLEL:
+
 # These are the targets that are made by making them in each subdirectory.
 +subdir_targets	:= subdir_lib objects objs others subdir_mostlyclean	\
 		   subdir_clean subdir_distclean subdir_realclean	\