Merge from trunk

[gnu-emacs] / leim / Makefile.in

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 90698d7f16932a7a7e801f8e332861b4397abbcd..6eb18bc76d9a62411236c2254d3a06f0b876d171 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,9 +1,9 @@
 # Makefile for leim subdirectory in GNU Emacs.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008, 2009
+#   2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008, 2009
+#   2006, 2007, 2008, 2009, 2010
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H14PRO021
 
@@ -40,14 +40,11 @@ INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim
 
 GZIP_PROG = @GZIP_PROG@
 
-# On IBM RS6000, double-dot gets screwed up.
-dot = .
-
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # byte-compile Emacs Lisp files, and generate the file leim-list.el.
-BUILT-EMACS = ${dot}${dot}/src/emacs
+BUILT-EMACS = ../src/emacs
 
-buildlisppath=${srcdir}/${dot}${dot}/lisp
+buildlisppath=${srcdir}/../lisp
 
 # How to run Emacs.
 RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
@@ -161,7 +158,7 @@ all: ${BUILT-EMACS} ${SUBDIRS} leim-list.el ${WORLD}
 
 # To ensure that we can run Emacs.  This target is ignored (never
 # being hit) if a user changes default value of EMACS.
-${dot}${dot}/src/emacs:
+../src/emacs:
        cd ../src; ${MAKE} ${MFLAGS} emacs
 
 ${SUBDIRS}:
@@ -224,7 +221,7 @@ MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
 
 install: all
        if [ ! -d ${INSTALLDIR} ] ; then \
-          umask 022; ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
+          umask 022; ${srcdir}/../mkinstalldirs ${INSTALLDIR}; \
        else true; fi
        if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
          rm -f ${INSTALLDIR}/leim-list.el; \
@@ -240,8 +237,6 @@ install: all
            tar -chf - quail/* ja-dic \
                | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
          fi; \
-         rm -rf ${INSTALLDIR}/CVS        ${INSTALLDIR}/*/CVS; \
-         rm -f  ${INSTALLDIR}/.cvsignore ${INSTALLDIR}/*/.cvsignore; \
          rm -f  ${INSTALLDIR}/.gitignore ${INSTALLDIR}/*/.gitignore; \
          rm -f  ${INSTALLDIR}/.arch-inventory ${INSTALLDIR}/*/.arch-inventory; \
          rm -f  ${INSTALLDIR}/\#*        ${INSTALLDIR}/*/\#* ; \
@@ -278,16 +273,17 @@ clean mostlyclean:
 # bootstrapping should not leave non-fresh .elc files behind.
 bootstrap-clean: clean
        rm -f ${WORLD}
+## FIXME some compiled files go to srcdir, some don't?
+#      cd ${srcdir}; rm -f *.elc */*.elc
 
 distclean: clean
        if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi
        rm -f Makefile
 
-maintainer-clean: distclean
-       rm -f ${WORLD}
+maintainer-clean: distclean bootstrap-clean
 
 extraclean: maintainer-clean
-       -rm -f *~ \#* m/?*~ s/?*~
+       -rm -f *~ \#* */*~ */\#*
 
 .PHONY: check-declare