X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=0dbddc468d4acbc3c84cbcf4c4c768ba5e36b978;hb=3d7e2be4c826aa7c2d2c337a53c9c5593b1d7d8f;hp=705f8bc8a6563b2d7586eee8d0346856d4dfe35a;hpb=4abb0c3c695dcd4c383deda58d0b99af36f36d36;p=elisp%2Fgnus.git-

diff --git a/Makefile.in b/Makefile.in
index 705f8bc..0dbddc4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,8 +5,8 @@ srcdir = @srcdir@
 
 @SET_MAKE@
 EMACS = @EMACS@
-XEMACS = xemacs21
-PACKAGEDIR =
+XEMACS = @XEMACS@
+PACKAGEDIR = @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-info
+
+xinfo-ja:
+	cd texi && $(MAKE) EMACS="$(XEMACS)" MAKEINFO=no ja-info
+
 # Rule for Lars and nobody else.
 some:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" some
@@ -47,24 +57,25 @@ info-ja:
 
 clean:
 	rm -f */*.orig */*.rej *.orig *.rej
+	rm -f MANIFEST.*
+	for i in lisp texi; do (cd $$i; $(MAKE) clean); done
 
 xsome:
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" some
 
 elclean:
-	rm lisp/*.elc
+	cd lisp && rm -f *.elc auto-autoloads.el custom-load.el
 
 x:
-	make EMACS=xemacs21
+	$(MAKE) EMACS="$(XEMACS)"
 
-distclean:
-	make clean
+distclean: clean
 	rm -rf *~
-	for i in lisp texi; do (cd $$i; make distclean); done
+	for i in lisp texi; do (cd $$i; $(MAKE) distclean); done
 	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