From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Thu, 15 Sep 2016 08:37:50 +0000 (+0100)
Subject: autoconf support
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac145ce66189fde2c697a7b64d3a1092784fd2e4;p=emacs.git

autoconf support
---

diff --git a/configure.ac b/configure.ac
index c94ecb629ef..2e750970d69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5361,12 +5361,12 @@ dnl This will work, but you get a config.status that is not quite right
 dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html).
 dnl That doesn't have any obvious consequences for Emacs, but on the whole
 dnl it seems better to just live with the duplication.
-SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile"
+SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile packages/Makefile"
 
 AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
        doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
        doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \
-       leim/Makefile nextstep/Makefile nt/Makefile])
+       leim/Makefile nextstep/Makefile nt/Makefile packages/Makefile])
 
 dnl test/ is not present in release tarfiles.
 opt_makefile=test/Makefile
diff --git a/packages/GNUmakefile b/packages/GNUmakefile
deleted file mode 100644
index a19d3613f1b..00000000000
--- a/packages/GNUmakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-## This file is called GNUmakefile because Makefile is git ignored. Rename
-## when this is autoconf'd
-
-
-EMACS=../src/emacs
-ELPA=../../elpa
-
-
-DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
-
-## dependent on makefile
-all: pkg-all $(EMACS)
-
-check: cleanlog check-packages ert-summarize
-
-check-maybe: check-packages
-
-WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
-
-gnumakefile-inc.mk: ./admin/package-makefile.el
-	$(EMACS) --batch --load admin/package-makefile.el \
-		--funcall package-makefile
-
-include gnumakefile-inc.mk
-
-cleanlog:
-	find . -name "*log" -exec rm -v {} \;
-
-clean: cleanlog
-	find . -name "*pkg.el" -exec rm -v {} \;
-	find . -name "*-autoloads.el" -exec rm -v {} \;
-	find . -name "*elc" -exec rm -v {} \;
-
-
-.PHONY: check clean all
diff --git a/packages/Makefile.in b/packages/Makefile.in
new file mode 100644
index 00000000000..e944de8675e
--- /dev/null
+++ b/packages/Makefile.in
@@ -0,0 +1,34 @@
+### @configure_input@
+
+
+EMACS= ../src/emacs
+ELPA=../../elpa
+
+
+DIRS=$(filter-out .,$(subst ./,,$(shell find . -maxdepth 1 -type d)))
+
+## dependent on makefile
+all: pkg-all $(EMACS)
+
+check: cleanlog check-packages ert-summarize
+
+check-maybe: check-packages
+
+WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
+
+gnumakefile-inc.mk: ./admin/package-makefile.el
+	$(EMACS) --batch --load admin/package-makefile.el \
+		--funcall package-makefile
+
+include makefile-inc.mk
+
+cleanlog:
+	find . -name "*log" -exec rm -v {} \;
+
+clean: cleanlog
+	find . -name "*pkg.el" -exec rm -v {} \;
+	find . -name "*-autoloads.el" -exec rm -v {} \;
+	find . -name "*elc" -exec rm -v {} \;
+
+
+.PHONY: check clean all
diff --git a/packages/README.org b/packages/README.org
index 719b13dce27..9c5fa7b3c28 100644
--- a/packages/README.org
+++ b/packages/README.org
@@ -49,8 +49,6 @@ disabled. Most of these do not have regular test file locations at the moment.
 
 There is no support for make install.
 
-There is no support for autoconf.
-
 There is no support for info.
 
 Files in the "admin" directory should probably be in the emacs-root admin.
diff --git a/packages/admin/package-makefile.el b/packages/admin/package-makefile.el
index 2f0086ba50e..3ea4edae964 100644
--- a/packages/admin/package-makefile.el
+++ b/packages/admin/package-makefile.el
@@ -141,7 +141,7 @@
   (with-temp-buffer
     (insert
      (package-makefile--1))
-    (write-file "gnumakefile-inc.mk")))
+    (write-file "makefile-inc.mk")))
 
 ;; example: core/example/example-pkg.el
 ;; core/example/example-pkg.el