Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

[gnu-emacs] / leim / makefile.w32-in

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 08b029db861afa51107228d2f48658419fc0fe1f..7a01529665e041c79601779cda990eb79541dd44 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -1,6 +1,6 @@
-# -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API.
+# -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft Windows API.
 
-# Copyright (C) 2000-2011  Free Software Foundation, Inc.
+# Copyright (C) 2000-2013 Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 #   2006, 2007
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -118,8 +118,10 @@ MISC= \
        $(srcdir)/quail/arabic.elc \
        $(srcdir)/quail/ethiopic.elc \
        $(srcdir)/quail/ipa.elc \
+       $(srcdir)/quail/ipa-praat.elc \
        $(srcdir)/quail/hebrew.elc \
        $(srcdir)/quail/georgian.elc \
+       $(srcdir)/quail/persian.elc \
        $(srcdir)/quail/sisheng.elc
 
 MISC_DIC=\
@@ -199,13 +201,13 @@ leim-list.el: $(SUBDIRS) $(WORLD) $(srcdir)/leim-ext.el
 
 install: all
        - mkdir "$(INSTALLDIR)"
-       - $(DEL) same-dir.tst
-       - $(DEL) $(INSTALL_DIR)/same-dir.tst
-       echo SameDirTest > $(INSTALL_DIR)/same-dir.tst
+       - $(DEL) $(DIRNAME)_same-dir.tst
+       - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
+       echo SameDirTest > $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
        $(IFNOTSAMEDIR) $(CP) leim-list.el $(INSTALLDIR) $(ENDIF)
        $(IFNOTSAMEDIR) $(CP_DIR) quail $(INSTALLDIR) $(ENDIF)
        $(IFNOTSAMEDIR) $(CP_DIR) ja-dic $(INSTALLDIR) $(ENDIF)
-       - $(DEL) $(INSTALL_DIR)/same-dir.tst
+       - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst
 
 clean mostlyclean:
        - $(FOREACH) $(TIT) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)