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

diff --git a/Makefile.in b/Makefile.in
index 705f8bc..f0c8650 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
 
@@ -15,23 +15,53 @@ all-ja: lick info info-ja
 lick:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
 
-install:
+install: install-lisp install-info
+
+install-ja: install install-info-ja
+
+install-lisp:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
+
+install-info:
 	cd texi && $(MAKE) EMACS="$(EMACS)" install
 
-package: all
-	cd lisp && $(MAKE) EMACS="$(EMACS)" package
+install-info-ja:
+	cd texi && $(MAKE) EMACS="$(EMACS)" install-ja
+
+## Rule for XEmacs package.
+install-package: xlick install-package-lick xinfo install-package-info
+
+install-package-ja: install-package xinfo-ja install-package-info-ja
+
+package: xlick xinfo compose-package
+
+package-ja: xlick xinfo xinfo-ja compose-package
+
+# Sub-rule for XEmacs package.
+install-package-lick:
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
+		install-package-lick
 
-install-package: info
-	cd lisp && $(MAKE) EMACS="$(EMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
-		install-package
+install-package-info:
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
+		install-package-info
 
-package-ja: all-ja
-	cd lisp && $(MAKE) EMACS="$(EMACS)" package
+install-package-info-ja:
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
+		install-package-info-ja
 
-install-package-ja: info info-ja
-	cd lisp && $(MAKE) EMACS="$(EMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
-		install-package
+compose-package:
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" compose-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)" ja-info
 
 # Rule for Lars and nobody else.
 some:
@@ -43,29 +73,27 @@ info:
 	cd texi && $(MAKE) EMACS="$(EMACS)" all
 
 info-ja:
-	cd texi && $(MAKE) EMACS=$(EMACS) MAKEINFO=no ja
+	cd texi && $(MAKE) EMACS=$(EMACS) ja
 
 clean:
 	rm -f */*.orig */*.rej *.orig *.rej
-
-xsome:
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" some
+	rm -f MANIFEST.*
+	for i in lisp texi; do (cd $$i; $(MAKE) clean); done
 
 elclean:
-	rm lisp/*.elc
+	cd lisp && rm -f *.elc auto-autoloads.el custom-load.el
 
 x:
-	make EMACS=xemacs21
+	$(MAKE) EMACS="$(XEMACS)"
+
+xsome:
+	$(MAKE) EMACS="$(XEMACS)" some
 
-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
-
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in