From: yamaoka <yamaoka>
Date: Wed, 24 Feb 1999 03:30:30 +0000 (+0000)
Subject: * (xlick, xinfo, xinfo-ja): New targets.
X-Git-Tag: t-gnus-6_10_059-03~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b55989a5a5d35bcada1b03f9e2d9a4d3efc1df4c;p=elisp%2Fgnus.git-

* (xlick, xinfo, xinfo-ja): New targets.
(install-package-ja, package-ja, install-package, package): Use them; use
$XEMACS instead of $EMACS.
(osome): Use $XEMACS instead of "xemacs21".
(x): Ditto.
(XEMACS): Use "xemacs" instead of "xemacs21" in default.
---

diff --git a/Makefile.in b/Makefile.in
index 705f8bc..65bf9fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,7 @@ srcdir = @srcdir@
 
 @SET_MAKE@
 EMACS = @EMACS@
-XEMACS = xemacs21
+XEMACS = xemacs
 PACKAGEDIR =
 
 all: lick info
@@ -19,20 +19,30 @@ install:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
 	cd texi && $(MAKE) EMACS="$(EMACS)" install
 
-package: all
-	cd lisp && $(MAKE) EMACS="$(EMACS)" package
+# Rule for XEmacs package.
+package: xlick xinfo
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" package
 
-install-package: info
-	cd lisp && $(MAKE) EMACS="$(EMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
+install-package: xinfo
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
 		install-package
 
-package-ja: all-ja
-	cd lisp && $(MAKE) EMACS="$(EMACS)" package
+package-ja: xlick xinfo xinfo-ja
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" package
 
-install-package-ja: info info-ja
-	cd lisp && $(MAKE) EMACS="$(EMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
+install-package-ja: xinfo xinfo-ja
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
 		install-package
 
+xlick:
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" all
+
+xinfo:
+	cd texi && $(MAKE) EMACS="$(XEMACS)" all
+
+xinfo-ja:
+	cd texi && $(MAKE) EMACS=$(XEMACS) MAKEINFO=no ja
+
 # Rule for Lars and nobody else.
 some:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" some
@@ -55,7 +65,7 @@ elclean:
 	rm lisp/*.elc
 
 x:
-	make EMACS=xemacs21
+	make EMACS="$(XEMACS)"
 
 distclean:
 	make clean
@@ -64,7 +74,7 @@ distclean:
 	rm -f config.log config.status config.cache Makefile
 
 osome:
-	make EMACS=xemacs21 some
+	make EMACS="$(XEMACS)" some
 
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck