[Emacs-diffs] /srv/bzr/emacs/trunk r107834: Generate admin/unidata/Makefile with configure

[Glenn Morris]

------------------------------------------------------------
revno: 107834
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-10 00:18:02 -0700
message:
  Generate admin/unidata/Makefile with configure
  
  * configure.in: Conditionally generate admin/unidata/Makefile.
  
  * admin/unidata/Makefile.in: Add FSF copyright.
  Make it use autoconf features, and work for out-of-tree builds.
modified:
  ChangeLog
  admin/ChangeLog
  admin/unidata/Makefile.in
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-04-09 13:10:22 +0000
+++ b/ChangeLog 2012-04-10 07:18:02 +0000
@@ -1,8 +1,10 @@
+2012-04-10  Glenn Morris  <address@hidden>
+
+       * configure.in: Conditionally generate admin/unidata/Makefile.
+
 2012-04-09  Teodor Zlatanov  <address@hidden>
 
-       * info/dir (File):
-       * Makefile.in: Add emacs-gnutls to the info directory and the
-       INFO_FILES target.
+       * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls manual.
 
 2012-04-09  Glenn Morris  <address@hidden>
 

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-04-07 14:26:14 +0000
+++ b/admin/ChangeLog   2012-04-10 07:18:02 +0000
@@ -1,3 +1,8 @@
+2012-04-10  Glenn Morris  <address@hidden>
+
+       * unidata/Makefile.in: Add FSF copyright.
+       Make it use autoconf features, and work for out-of-tree builds.
+
 2012-04-07  Eli Zaretskii  <address@hidden>
 
        * unidata/README:

=== modified file 'admin/unidata/Makefile.in'
--- a/admin/unidata/Makefile.in 2011-08-15 17:47:25 +0000
+++ b/admin/unidata/Makefile.in 2012-04-10 07:18:02 +0000
@@ -1,4 +1,7 @@
 # Makefile -- Makefile to generate character property tables.
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
@@ -18,25 +21,33 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-
-EMACS = ../../src/emacs
-DSTDIR = ../../lisp/international
-RUNEMACS = ${EMACS} -Q -batch
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+abs_builddir = @abs_builddir@
+top_srcdir = @top_srcdir@
+abs_top_builddir = @abs_top_builddir@
+
+EMACS = ${abs_top_builddir}/src/emacs
+DSTDIR = ${top_srcdir}/lisp/international
+emacs = ${EMACS} -batch --no-site-file --no-site-lisp
 
 all: ${DSTDIR}/charprop.el
 
 .el.elc:
-       ${RUNEMACS} -batch -f batch-byte-compile $<
-
-unidata.txt: UnicodeData.txt
-       sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < 
UnicodeData.txt > $@
-
-${DSTDIR}/charprop.el: unidata-gen.elc unidata.txt
-       ELC=`/bin/pwd`/unidata-gen.elc; \
-       DATADIR=`/bin/pwd`; \
-       DATA=unidata.txt; \
-       cd ${DSTDIR}; \
-       ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATADIR} 
$${DATA}
+       ${emacs} -f batch-byte-compile $<
+
+unidata.txt: ${srcdir}/UnicodeData.txt
+       sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < 
${srcdir}/UnicodeData.txt > $@
+
+${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
+       cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \
+         -f unidata-gen-files ${srcdir} ${abs_builddir}/unidata.txt
+
+## Like the above, but generate in PWD rather than lisp/international.
+charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
+       ${emacs} -l ${srcdir}/unidata-gen \
+         -f unidata-gen-files ${srcdir} unidata.txt
 
 install: charprop.el
        cp charprop.el ${DSTDIR}
@@ -46,4 +57,9 @@
        if test -f charprop.el; then \
          rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
        fi
-       rm -f charprop.el unidata-gen.elc unidata.txt
+       rm -f charprop.el ${srcdir}/unidata-gen.elc unidata.txt
+
+distclean: clean
+       -rm -f ./Makefile
+
+maintainer-clean: distclean

=== modified file 'configure.in'
--- a/configure.in      2012-04-09 00:50:17 +0000
+++ b/configure.in      2012-04-10 07:18:02 +0000
@@ -3834,6 +3834,16 @@
   AC_CONFIG_FILES([test/automated/Makefile])
 fi
 
+
+dnl admin/ may or may not be present.
+opt_makefile=admin/unidata/Makefile
+
+if test -f $srcdir/${opt_makefile}.in; then
+  SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
+  AC_CONFIG_FILES([admin/unidata/Makefile])
+fi
+
+
 SUBDIR_MAKEFILES_IN=`echo " ${SUBDIR_MAKEFILES}" | sed -e 's| | $(srcdir)/|g' 
-e 's|Makefile|Makefile.in|g'`
 
 AC_SUBST(SUBDIR_MAKEFILES_IN)