Merge from emacs--rel--22

[gnu-emacs] / leim / Makefile.in

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 8ffa462c89602d5d806b3b892a328e9194113b9c..731f0d55312ae128b40bc03708070d8ecd790f36 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,26 +1,27 @@
 # Makefile for leim subdirectory in GNU Emacs.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007, 2008
 #   Free Software Foundation, Inc.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007, 2008
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H14PRO021
 
 # This file is part of GNU Emacs.
 
-# GNU Emacs is free software; you can redistribute it and/or modify
+# 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 3, or (at your option)
-# any later version.
-#
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.
@@ -32,13 +33,14 @@ prefix=@prefix@
 datarootdir=@datarootdir@
 datadir=@datadir@
 srcdir=@srcdir@
+ns_appresdir=@ns_appresdir@
 
 # Where to install LEIM files.
 INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim
 
 GZIP_PROG = @GZIP_PROG@
 
-# On Xenix and the IBM RS6000, double-dot gets screwed up.
+# On IBM RS6000, double-dot gets screwed up.
 dot = .
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
@@ -89,7 +91,6 @@ CHINESE-BIG5=${TIT-BIG5} ${NON-TIT-BIG5}
 JAPANESE=${srcdir}/quail/japanese.elc ${srcdir}/ja-dic/ja-dic.elc
 
 KOREAN=        ${srcdir}/quail/hangul.elc      \
-       ${srcdir}/quail/hangul3.elc     \
        ${srcdir}/quail/hanja.elc       \
        ${srcdir}/quail/hanja3.elc      \
        ${srcdir}/quail/hanja-jis.elc   \
@@ -153,7 +154,8 @@ NON-TIT-MISC=${CHINESE-NON-TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${OTHERS}
 .SUFFIXES: .elc .el
 
 .el.elc:
-       ${RUN-EMACS} -f batch-byte-compile $<
+       @echo Compiling $<
+       @${RUN-EMACS} -f batch-byte-compile $<
 
 all: ${BUILT-EMACS} ${SUBDIRS} leim-list.el ${WORLD}
 
@@ -206,6 +208,7 @@ changed.misc: ${MISC-SOURCES}
          echo "changed" > $@
 
 leim-list.el: ${SUBDIRS} ${TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
+       rm -rf leim-list.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 \
@@ -257,6 +260,11 @@ install: all
          [ -n "$${installuser}" ] && break ; \
        done ; \
        find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
+       if [ "${ns_appresdir}" != "" ]; then \
+         ( cd ${ns_appresdir} ; \
+           if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \
+           rm -fr share ) ; \
+       else true ; fi
 
 clean mostlyclean:
        rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \