Re-arrange macros so that the macro TIT contains

only Quial packages generated from CXTERM dictionaries, and the
macro NON-TIT contains only Quial packages distributed with Emacs.
(install): Do not use -h option for tar, instead copy ${NON-TIT}
and ${TIT} separately.

1 files changed, 21 insertions, 8 deletions

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 3e6ad0a3fe4..ec83969cea9 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -72,15 +72,21 @@ TIT-BIG5=\
         quail/QJ-b5.el          \
         quail/ZOZY.el
 
-TIT=${TIT-GB} ${TIT-BIG5}
+CHINESE-TIT=${TIT-GB} ${TIT-BIG5}
 
-CHINESE-GB=${TIT-GB} \
-        quail/py-punct.el
+NON-TIT-GB=quail/py-punct.el
 
-CHINESE-BIG5=${TIT-BIG5} \
-        quail/quick-b5.el quail/tsang-b5.el quail/pypunct-b5.el
+NON-TIT-BIG5=quail/quick-b5.el quail/tsang-b5.el quail/pypunct-b5.el
 
-CHINESE-CNS=quail/quick-cns.el quail/tsang-cns.el
+NON-TIT-CNS=quail/quick-cns.el quail/tsang-cns.el
+
+CHINESE-NON-TIT=${NON-TIT-GB} ${NON-TIT-BIG5} ${NON-TIT-CNS}
+
+CHINESE-GB=${TIT-GB} ${NON-TIT-GB}
+
+CHINESE-BIG5=${TIT-BIG5} ${NON-TIT-BIG5} 
+
+CHINESE-CNS=${NON-TIT-CNS} 
 
 JAPANESE=quail/japanese.el skk/skkdic.el
 
@@ -114,6 +120,9 @@ ASIA=${EASTASIA} ${THAI} ${VIETNAMESE} ${LAO} ${INDIAN} ${TIBETAN}
 EUROPEAN=${LATIN} ${GREEK} ${RUSSIAN}
 WORLD=${ASIA} ${EUROPEAN} ${MISC}
 
+TIT=${CHINESE-TIT}
+NON-TIT=${CHINESE-NON-TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${MISC}
+
 all: ${EMACS} ${SUBDIRS} ${WORLD} leim-list.el
 
 # To ensure that we can run Emacs.  This target is ignored (never
@@ -156,8 +165,12 @@ install: all
           rm -rf ${INSTALLDIR}/leim-list.el; \
           rm -rf ${INSTALLDIR}/quail ${INSTALLDIR}/skk ; \
           echo "Copying leim files to ${INSTALLDIR} ..." ; \
-          tar -chf - leim-list.el ${SUBDIRS} \
-               | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
+          cp leim-list.el ${INSTALLDIR} ; \
+          tar -cf - ${TIT} \
+                | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
+          cd ${srcdir}; \
+          tar -cf - ${NON-TIT} \
+                | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
         else true; fi
 
 clean mostlyclean: