From ac145ce66189fde2c697a7b64d3a1092784fd2e4 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Thu, 15 Sep 2016 09:37:50 +0100 Subject: [PATCH] autoconf support --- configure.ac | 4 ++-- packages/{GNUmakefile => Makefile.in} | 7 +++---- packages/README.org | 2 -- packages/admin/package-makefile.el | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) rename packages/{GNUmakefile => Makefile.in} (81%) 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/Makefile.in similarity index 81% rename from packages/GNUmakefile rename to packages/Makefile.in index a19d3613f1b..e944de8675e 100644 --- a/packages/GNUmakefile +++ b/packages/Makefile.in @@ -1,8 +1,7 @@ -## This file is called GNUmakefile because Makefile is git ignored. Rename -## when this is autoconf'd +### @configure_input@ -EMACS=../src/emacs +EMACS= ../src/emacs ELPA=../../elpa @@ -21,7 +20,7 @@ gnumakefile-inc.mk: ./admin/package-makefile.el $(EMACS) --batch --load admin/package-makefile.el \ --funcall package-makefile -include gnumakefile-inc.mk +include makefile-inc.mk cleanlog: find . -name "*log" -exec rm -v {} \; 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 -- 2.39.5