tutor: Preparation for tutor1/2

Makefile

@@ -23,7 +23,8 @@ import-en-files:
 		"$(VIM_SRC_DIR)"/runtime/doc/vimtutor.1 \
 		"$(VIM_SRC_DIR)"/runtime/doc/xxd.1 \
 		runtime/doc/
-	cp "$(VIM_SRC_DIR)"/runtime/tutor/tutor runtime/tutor/
+	cp "$(VIM_SRC_DIR)"/runtime/tutor/tutor1 runtime/tutor/
+	cp "$(VIM_SRC_DIR)"/runtime/tutor/tutor2 runtime/tutor/
 	cp "$(VIM_SRC_DIR)"/nsis/lang/english.nsi nsis/lang/
 
 # Update Vim source directory.
@@ -69,7 +70,7 @@ install: test
 	cp src/po/ja.sjis.mo $(INSTALL_DIR)/lang/ja.sjis/LC_MESSAGES/vim.mo
 	cp runtime/lang/menu_ja*.vim $(INSTALL_DIR)/lang
 	cp runtime/doc/*.UTF-8.1 $(INSTALL_DIR)/doc
-	cp runtime/tutor/tutor.ja.* $(INSTALL_DIR)/tutor
+	cp runtime/tutor/tutor*.ja.* $(INSTALL_DIR)/tutor
 
 clean:
 	rm -rf $(ARCHIVE_DIR) $(ARCHIVE_FILE)
@@ -102,7 +103,7 @@ $(ARCHIVE_DIR):
 	cp src/po/*.po $@/src/po
 	cp runtime/lang/menu_ja*.vim $@/runtime/lang
 	cp runtime/doc/*.UTF-8.1 $@/runtime/doc
-	cp runtime/tutor/tutor.ja.* $@/runtime/tutor
+	cp runtime/tutor/tutor*.ja.* $@/runtime/tutor
 	cp nsis/lang/japanese.nsi $@/nsis/lang
 
 $(ARCHIVE).tar.gz: $(ARCHIVE_DIR)

runtime/tutor/Makefile

@@ -1,20 +1,20 @@
-MASTER_TUTOR = tutor.ja.utf-8
+MASTER_TUTOR1 = tutor1.ja.utf-8
 
 test: update
 
-update: tutor.ja.sjis tutor.ja.euc
+update: tutor1.ja.sjis tutor1.ja.euc
 
-tutor.ja.sjis: $(MASTER_TUTOR)
+tutor1.ja.sjis: $(MASTER_TUTOR1)
 	iconv -f utf-8 -t cp932 < $< > $@
 
-tutor.ja.euc: $(MASTER_TUTOR)
+tutor1.ja.euc: $(MASTER_TUTOR1)
 	iconv -f utf-8 -t euc-jp < $< > $@
 
 force: touch
 	@$(MAKE) update
 
-touch: $(MASTER_TUTOR)
+touch: $(MASTER_TUTOR1)
 	touch $<
 
 clean:
-	rm -f tutor.ja.sjis tutor.ja.euc
+	rm -f tutor1.ja.sjis tutor1.ja.euc