From: morioka <morioka>
Date: Mon, 2 Mar 1998 14:44:40 +0000 (+0000)
Subject: tm 6.20
X-Git-Tag: tm6_20~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=724e690fd5d2167cbc507fcee4880453ceb123c8;p=elisp%2Ftm.git

tm 6.20
---

diff --git a/Makefile b/Makefile
index 0701d10..2300a1a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 #
-# $Id: Makefile,v 6.3 1995/05/01 19:17:16 morioka Exp morioka $
+# $Id: Makefile,v 6.6 1995/05/15 04:20:56 morioka Exp morioka $
 #
 
+SHELL = /bin/csh
+
 # Please specify emacs executables:
 #	NEMACS	= for NEMACS (or NEpoch)
 #	MULE1	= for Mule 1.* (based on Emacs 18.*)
@@ -18,10 +20,10 @@
 #	TMDIR19 = for Emacs 19.* (FSF original, XEmacs or MULE 2)
 
 	TMDIR18 = /usr/local/lib/emacs/local.lisp/tm
-#	TMDIR19 = /usr/local/lib/mule/site-lisp
+	TMDIR19 = /usr/local/lib/mule/site-lisp
 
 #	TMDIR18 = $(HOME)/lib/emacs18/lisp
-	TMDIR19 = $(HOME)/lib/emacs19/lisp
+#	TMDIR19 = $(HOME)/lib/emacs19/lisp
 
 # Please specify GNUS type (`gnus3' or `gnus4') if you use Emacs 18.*
 	EMACS18_GNUS  = gnus3
@@ -34,9 +36,13 @@
 	MULE2_OPT =
 
 bindir	= $(HOME)/bin
+
 CC	= gcc
 CFLAGS	= -O
 
+RM	= /bin/rm
+CP	= /bin/cp -p
+
 UTILS	= ol2 decode-b
 GOMI	= $(UTILS) *.elc .lpath.el
 FILES	= tm/README.eng tm/rel-*.ol \
@@ -47,7 +53,7 @@ FILES	= tm/README.eng tm/rel-*.ol \
 	tm/mh-e/Makefile tm/mh-e/Makefile.bc tm/mh-e/*.el \
 	tl/README.eng tl/Makefile tl/Makefile.bc tl/*.el tl/doc/*.texi
 
-TARFILE = tm6.19.1.tar
+TARFILE = tm6.20.tar
 
 
 lpath-nemacs:
@@ -57,7 +63,10 @@ nemacs:	lpath-nemacs
 	make -f Makefile.bc all EMACS=$(NEMACS) EMACS_TYPE=nemacs
 	(cd gnus; make nemacs NEMACS=$(NEMACS) EMACS18_GNUS=$(EMACS18_GNUS))
 	(cd mh-e; make nemacs NEMACS=$(NEMACS) NEMACS_MH_E=$(NEMACS_MH_E))
-	
+
+nemacs-vm: lpath-nemacs
+	make -f Makefile.bc tm-vm EMACS=$(NEMACS) EMACS_TYPE=nemacs
+
 install-nemacs:	nemacs install-mua-18
 	make -f Makefile.bc install TMDIR=$(TMDIR18) EMACS_TYPE=nemacs
 
@@ -70,12 +79,16 @@ mule1:	lpath-mule1
 	(cd gnus; make mule1 MULE1=$(MULE1) EMACS18_GNUS=$(EMACS18_GNUS))
 	(cd mh-e; make mule1 MULE1=$(MULE1) MULE1_MH_E=$(MULE1_MH_E))
 
+mule1-vm: lpath-nemacs
+	make -f Makefile.bc tm-vm EMACS=$(MULE1) EMACS_TYPE=mule
+
 install-mule1:	mule1 install-mua-18
 	make -f Makefile.bc install TMDIR=$(TMDIR18) EMACS_TYPE=mule
 
 install-mua-18:
 	(cd gnus; make install-18 TMDIR18=$(TMDIR18))
 	(cd mh-e; make install-18 TMDIR18=$(TMDIR18))
+	make -f Makefile.bc install-tm-vm TMDIR=$(TMDIR18)
 
 
 lpath-orig19:
@@ -86,6 +99,9 @@ orig19:	lpath-orig19
 	(cd gnus; make orig19 ORIG19=$(ORIG19))
 	(cd mh-e; make orig19 ORIG19=$(ORIG19))
 
+orig19-vm: lpath-nemacs
+	make -f Makefile.bc tm-vm EMACS=$(ORIG19) EMACS_TYPE=orig
+
 install-orig19:	orig19 install-mua-19
 	make -f Makefile.bc install TMDIR=$(TMDIR19) EMACS_TYPE=orig
 
@@ -98,12 +114,16 @@ mule2:	lpath-mule2
 	(cd gnus; make mule2 MULE2=$(MULE2))
 	(cd mh-e; make mule2 MULE2=$(MULE2))
 
+mule2-vm: lpath-nemacs
+	make -f Makefile.bc tm-vm EMACS=$(MULE2) EMACS_TYPE=mule
+
 install-mule2:	mule2 install-mua-19
 	make -f Makefile.bc install TMDIR=$(TMDIR19) EMACS_TYPE=mule
 
 install-mua-19:
 	(cd gnus; make install-19 TMDIR19=$(TMDIR19))
 	(cd mh-e; make install-19 TMDIR19=$(TMDIR19))
+	make -f Makefile.bc install-tm-vm TMDIR=$(TMDIR19)
 
 
 all:	$(UTILS) $(DVI)
@@ -126,12 +146,12 @@ ps:	ol2
 
 
 install:	$(UTILS) methods
-	cp -p $(UTILS) $(bindir)
-	cp -p methods/* $(bindir)
+	$(CP) $(UTILS) $(bindir)
+	$(CP) methods/* $(bindir)
 
 
 clean:
-	-rm $(GOMI)
+	-$(RM) $(GOMI)
 	-(cd doc; make clean)
 	-(cd gnus; make clean)
 	-(cd mh-e; make clean)
diff --git a/Makefile.bc b/Makefile.bc
index 175bac7..fdd7dea 100644
--- a/Makefile.bc
+++ b/Makefile.bc
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.bc,v 5.0 1995/05/10 17:48:56 morioka Exp $
+# $Id: Makefile.bc,v 6.0 1995/05/15 04:13:07 morioka Exp $
 #
 
 TM_EL	= signature.el \
@@ -8,7 +8,10 @@ TM_EL	= signature.el \
 	tm-rmail.el \
 	tm-comp.el
 TM_ELC	= ${TM_EL:el=elc}
-ALL_EL	= $(TM_EL) tm-vm.el tm-setup.el mime-setup.el
+ALL_EL	= $(TM_EL) tm-setup.el mime-setup.el
+
+TM_VM_EL  = tm-vm.el
+TM_VM_ELC = ${TM_VM_EL:el=elc}
 
 BATCH	= $(EMACS) -batch -q .lpath.el -f eval-current-buffer
 
@@ -28,5 +31,15 @@ install:
 	mv $(TM_ELC) $(TMDIR)
 
 
+tm-vm:	$(TM_VM_ELC)
+
+$(TM_VM_ELC):
+
+install-tm-vm:
+	-(cd $(TMDIR); chmod +w $(TM_VM_EL))
+	cp -p $(TM_VM_EL) $(TMDIR)
+	-(mv $(TM_VM_ELC) $(TMDIR))
+
+
 clean:
 	-rm *.elc
diff --git a/gnus/Makefile.bc b/gnus/Makefile.bc
index a85ce12..7e6203e 100644
--- a/gnus/Makefile.bc
+++ b/gnus/Makefile.bc
@@ -1,10 +1,10 @@
 #
-# $Id: Makefile.bc,v 6.1 1995/05/10 17:51:38 morioka Exp $
+# $Id: Makefile.bc,v 6.2 1995/05/15 03:40:20 morioka Exp $
 #
 
 .SUFFIXES:	.el .elc
 
-BATCH	= $(EMACS) -batch -q ../.lpath.el -f eval-current-buffer
+BATCH	= $(EMACS) -batch ../.lpath.el -f eval-current-buffer .
 
 .el.elc:
 	$(BATCH) -l $(NNTP) -l $(GNUS) -f batch-byte-compile $<
diff --git a/mh-e/Makefile.bc b/mh-e/Makefile.bc
index 30d0aaf..4169381 100644
--- a/mh-e/Makefile.bc
+++ b/mh-e/Makefile.bc
@@ -1,10 +1,10 @@
 #
-# $Id: Makefile.bc,v 5.0 1995/05/10 17:50:31 morioka Exp $
+# $Id: Makefile.bc,v 6.0 1995/05/15 03:41:24 morioka Exp $
 #
 
 .SUFFIXES:	.el .elc
 
-BATCH	= $(EMACS) -batch -q ../.lpath.el -f eval-current-buffer
+BATCH	= $(EMACS) -batch ../.lpath.el -f eval-current-buffer .
 
 .el.elc:
 	$(BATCH) -l mh-e -f batch-byte-compile $<
diff --git a/tm-view.el b/tm-view.el
index edd609e..4a3c02e 100644
--- a/tm-view.el
+++ b/tm-view.el
@@ -21,7 +21,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 6.19 1995/04/28 06:13:27 morioka Exp morioka $")
+  "$Id: tm-view.el,v 6.20 1995/05/10 19:18:05 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)