X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=eef14c05c2922ecb0b2e7bde071acedec02c3293;hb=c27bc41ce6a1a8188a249dcf3f25959efe4fbb8e;hp=42944e38baa28a6c0aa8bbffbf542a293ccd2dfa;hpb=21b78c5cf88ba55a2a842d21a8ec028cf652d9b3;p=elisp%2Fgnus.git-

diff --git a/Makefile.in b/Makefile.in
index 42944e3..eef14c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,6 @@
 prefix = @prefix@
 datadir = @datadir@
+infodir = @infodir@
 lispdir = @lispdir@
 srcdir = @srcdir@
 
@@ -7,6 +8,24 @@ srcdir = @srcdir@
 EMACS = @EMACS@
 XEMACS = @XEMACS@
 PACKAGEDIR = @PACKAGEDIR@
+GNUS_PRODUCT_NAME = @GNUS_PRODUCT_NAME@
+
+# It will be used to look for the XEmacs package path if this file is
+# mis-configured (e.g. configured for FSFmacs).
+EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \
+	"(let (package-dir) \
+	   (if (boundp (quote early-packages)) \
+	       (let ((dirs (delq nil (append (if early-package-load-path \
+						 early-packages) \
+					     (if late-package-load-path \
+						 late-packages) \
+					     (if last-package-load-path \
+						 last-packages))))) \
+		 (while (and dirs (not package-dir)) \
+		   (if (file-directory-p (car dirs)) \
+		       (setq package-dir (car dirs) \
+			     dirs (cdr dirs)))))) \
+	   (princ (or package-dir \"\")))" 2>/dev/null
 
 all: lick info
 
@@ -15,39 +34,103 @@ all-ja: lick info info-ja
 lick:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
 
-install:
-	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
-	cd texi && $(MAKE) EMACS="$(EMACS)" install
-
-# Rule for XEmacs package.
-package: xlick add-info-suffix xinfo remove-info-suffix
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" package
+install: install-lisp install-info
 
-install-package: add-info-suffix xinfo xinfo remove-info-suffix
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
-		install-package
+install-ja: install install-info-ja
 
-package-ja: xlick add-info-suffix xinfo xinfo-ja remove-info-suffix
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" package
+install-lisp:
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
 
-install-package-ja: add-info-suffix xinfo xinfo-ja remove-info-suffix
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR="$(PACKAGEDIR)" \
-		install-package
+install-info:
+	cd texi && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir) install
+
+install-info-ja:
+	cd texi && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir) install-ja
+
+## Rule for XEmacs package.
+install-package: xlick compose-package remove-extra-files-in-package \
+	install-package-lisp \
+	install-package-info install-package-manifest
+
+install-package-ja: xlick compose-package remove-extra-files-in-package \
+	install-package-lisp \
+	install-package-info install-package-info-ja \
+	install-package-manifest
+
+package: xlick xinfo compose-package
+
+package-ja: xlick xinfo xinfo-ja compose-package
+
+# Sub-rule for XEmacs package.
+install-package-lisp:
+	@if test x$(PACKAGEDIR) = x; then \
+	  package_dir=`$(EXAMINE_PACKAGEDIR)`; \
+	else \
+	  package_dir="$(PACKAGEDIR)"; \
+	fi; \
+	echo "cd lisp && $(MAKE)" \
+		"lispdir=$$package_dir""/lisp/$(GNUS_PRODUCT_NAME)" \
+		"install-lisp"; \
+	cd lisp && $(MAKE) \
+		lispdir="$$package_dir""/lisp/$(GNUS_PRODUCT_NAME)" \
+		install-lisp
+
+install-package-info:
+	@if test x$(PACKAGEDIR) = x; then \
+	  package_dir=`$(EXAMINE_PACKAGEDIR)`; \
+	else \
+	  package_dir="$(PACKAGEDIR)"; \
+	fi; \
+	echo "cd texi && $(MAKE) EMACS=$(XEMACS)" \
+		"infodir=$$package_dir""/info install-info"; \
+	cd texi && $(MAKE) EMACS="$(XEMACS)" \
+		infodir="$$package_dir""/info" install-info
+
+install-package-info-ja:
+	@if test x$(PACKAGEDIR) = x; then \
+	  package_dir=`$(EXAMINE_PACKAGEDIR)`; \
+	else \
+	  package_dir="$(PACKAGEDIR)"; \
+	fi; \
+	echo "cd texi && $(MAKE) EMACS=$(XEMACS)" \
+		"infodir=$$package_dir""/info install-ja-info"; \
+	cd texi && $(MAKE) EMACS="$(XEMACS)" \
+		infodir="$$package_dir""/info" install-ja-info
+
+install-package-manifest:
+	@if test x$(PACKAGEDIR) = x; then \
+	  package_dir=`$(EXAMINE_PACKAGEDIR)`; \
+	else \
+	  package_dir="$(PACKAGEDIR)"; \
+	fi; \
+	echo "cd lisp && $(MAKE) EMACS=$(XEMACS) PACKAGEDIR=$$package_dir" \
+		"install-package-manifest"; \
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR=$$package_dir \
+		install-package-manifest
+
+remove-extra-files-in-package:
+	@if test x$(PACKAGEDIR) = x; then \
+	  package_dir=`$(EXAMINE_PACKAGEDIR)`; \
+	else \
+	  package_dir="$(PACKAGEDIR)"; \
+	fi; \
+	echo "cd lisp && $(MAKE) EMACS=$(XEMACS) PACKAGEDIR=$$package_dir" \
+		"remove-extra-files-in-package"; \
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR=$$package_dir \
+		remove-extra-files-in-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
+	cd texi && $(MAKE) EMACS="$(XEMACS)" all-info
 
 xinfo-ja:
-	cd texi && $(MAKE) EMACS="$(XEMACS)" MAKEINFO=no ja
-
-add-info-suffix:
-	cd texi && $(MAKE) EMACS="$(XEMACS)" add-info-suffix
-
-remove-info-suffix:
-	cd texi && $(MAKE) remove-info-suffix
+	cd texi && $(MAKE) EMACS="$(XEMACS)" ja-info
 
 # Rule for Lars and nobody else.
 some:
@@ -59,30 +142,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
 	rm -f MANIFEST.*
 	for i in lisp texi; do (cd $$i; $(MAKE) clean); done
 
-xsome:
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" some
-
 elclean:
 	cd lisp && rm -f *.elc auto-autoloads.el custom-load.el
 
 x:
 	$(MAKE) EMACS="$(XEMACS)"
 
+xsome:
+	$(MAKE) EMACS="$(XEMACS)" some
+
 distclean: clean
 	rm -rf *~
 	for i in lisp texi; do (cd $$i; $(MAKE) distclean); done
 	rm -f config.log config.status config.cache Makefile
 
-osome:
-	$(MAKE) EMACS="$(XEMACS)" some
-
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in