(flymake-err-line-patterns): Fix infloop in javac regexp.

[bpt/emacs.git] / leim / Makefile.in

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 5923711..188ac81 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for leim subdirectory in GNU Emacs.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 #   Free Software Foundation, Inc.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H14PRO021
 
@@ -9,7 +9,7 @@
 
 # GNU Emacs is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
@@ -29,11 +29,12 @@ SHELL = /bin/sh
 # Here are the things that we expect ../configure to edit.
 version=@version@
 prefix=@prefix@
+datarootdir=@datarootdir@
 datadir=@datadir@
 srcdir=@srcdir@
 
 # Where to install LEIM files.
-INSTALLDIR=${datadir}/emacs/${version}/leim
+INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim
 
 GZIP_PROG = @GZIP_PROG@
 
@@ -47,7 +48,7 @@ BUILT-EMACS = ${dot}${dot}/src/emacs
 buildlisppath=${srcdir}/${dot}${dot}/lisp
 
 # How to run Emacs.
-RUN-EMACS = EMACSLOADPATH=$(buildlisppath) \
+RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C\
        ${BUILT-EMACS} -batch --no-init-file --no-site-file --multibyte
 
 # Subdirectories to be made if ${srcdir} is different from the current
@@ -203,7 +204,7 @@ changed.misc: ${MISC-SOURCES}
          -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
          echo "changed" > $@
 
-leim-list.el: ${SUBDIRS} ${NON-TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
+leim-list.el: ${SUBDIRS} ${TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
        ${RUN-EMACS}  -l ${buildlisppath}/international/quail \
          -f batch-byte-compile-if-not-done ${TIT-MISC:.elc=.el}
        if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
@@ -216,6 +217,9 @@ leim-list.el: ${SUBDIRS} ${NON-TIT-MISC} changed.tit changed.misc ${srcdir}/leim
        sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
 
 install: all
+       if [ ! -d ${INSTALLDIR} ] ; then \
+          ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
+       else true; fi
        if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
          rm -rf ${INSTALLDIR}/leim-list.el; \
          rm -rf ${INSTALLDIR}/quail ${INSTALLDIR}/ja-dic ; \
@@ -252,6 +256,12 @@ clean mostlyclean:
        rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \
                leim-list.el changed.tit changed.misc
 
+# The following target is needed because the `clean' target only removes
+# TIT-generated files and doesn't touch compiled Quail packages.  But
+# bootstrapping should not leave non-fresh .elc files behind.
+bootstrap-clean: clean
+       rm -f ${WORLD}
+
 distclean: clean
        if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi
        rm -f Makefile