X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=fbc5432bc00810e84969e9e9838008ca832eea22;hb=e570792e389710369bc2e8b0dcb8ed9285696ed6;hp=a1bd47d92905477892519320c8d6c2fd17f89a0e;hpb=1f2b93a24df7b9914dbbc1a26a6e76c8da6511d1;p=elisp%2Fgnus.git-

diff --git a/Makefile.in b/Makefile.in
index a1bd47d..fbc5432 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,18 +19,20 @@ PWD=
 # 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)))))) \
+	"(let ((dirs (append \
+		      (if (and (boundp (quote configure-package-path)) \
+			       (listp configure-package-path)) \
+			  (delete \"\" configure-package-path)) \
+		      (if (boundp (quote early-packages)) \
+			  (append \
+			   (if early-package-load-path early-packages) \
+			   (if late-package-load-path late-packages) \
+			   (if last-package-load-path last-packages))))) \
+	       package-dir) \
+	   (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
@@ -40,9 +42,9 @@ all-ja: lick info info-ja
 lick:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
 
-install: install-lisp install-info
+install: install-lisp install-info install-etc
 
-install-ja: install install-info-ja
+install-ja: install install-info-ja install-etc
 
 install-lisp:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" install
@@ -50,22 +52,32 @@ install-lisp:
 install-info:
 	cd texi && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install
 
+install-etc:
+	cd etc && $(MAKE) EMACS="$(EMACS)" install
+
 install-info-ja:
 	cd texi && $(MAKE) EMACS="$(EMACS)" infodir="$(infodir)" install-ja
 
 ## Rule for XEmacs package.
-install-package: xclever compose-package remove-extra-files-in-package \
+install-package: \
+	xclever-package \
+	remove-extra-files-in-package \
 	install-package-lisp \
-	install-package-info install-package-manifest
+	install-package-info \
+	install-package-etc \
+	install-package-manifest
 
-install-package-ja: xclever compose-package remove-extra-files-in-package \
+install-package-ja: \
+	xclever-package \
+	remove-extra-files-in-package \
 	install-package-lisp \
 	install-package-info install-package-info-ja \
+	install-package-etc \
 	install-package-manifest
 
-package: xlick xinfo compose-package
+package: xlick-package xinfo
 
-package-ja: xlick xinfo xinfo-ja compose-package
+package-ja: xlick-package xinfo xinfo-ja
 
 # Sub-rule for XEmacs package.
 install-package-lisp:
@@ -103,6 +115,17 @@ install-package-info-ja:
 	cd texi && $(MAKE) EMACS="$(XEMACS)" \
 		infodir="$$package_dir""/info" install-ja-info
 
+install-package-etc:
+	@if test x$(PACKAGEDIR) = x; then \
+	  package_dir=`$(EXAMINE_PACKAGEDIR)`; \
+	else \
+	  package_dir="$(PACKAGEDIR)"; \
+	fi; \
+	echo "cd etc && $(MAKE) EMACS=$(XEMACS)" \
+		"etcdir=$$package_dir""/etc install"; \
+	cd etc && $(MAKE) EMACS="$(XEMACS)" \
+		etcdir="$$package_dir""/etc" install
+
 install-package-manifest:
 	@if test x$(PACKAGEDIR) = x; then \
 	  package_dir=`$(EXAMINE_PACKAGEDIR)`; \
@@ -110,8 +133,10 @@ install-package-manifest:
 	  package_dir="$(PACKAGEDIR)"; \
 	fi; \
 	echo "cd lisp && $(MAKE) EMACS=$(XEMACS) PACKAGEDIR=$$package_dir" \
+		"lispdir=$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" \
 		"install-package-manifest"; \
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR=$$package_dir \
+		lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" \
 		install-package-manifest
 
 remove-extra-files-in-package:
@@ -121,26 +146,41 @@ remove-extra-files-in-package:
 	  package_dir="$(PACKAGEDIR)"; \
 	fi; \
 	echo "cd lisp && $(MAKE) EMACS=$(XEMACS) PACKAGEDIR=$$package_dir" \
+		"lispdir=$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" \
 		"remove-extra-files-in-package"; \
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" PACKAGEDIR=$$package_dir \
+		lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" \
 		remove-extra-files-in-package
-
-compose-package:
-	cd lisp && $(MAKE) EMACS="$(XEMACS)" compose-package
 ##
 
 xclever:
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" clever
 
+xclever-package:
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" \
+	lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" clever
+
 xlick:
 	cd lisp && $(MAKE) EMACS="$(XEMACS)" lispdir="$(lispdir)" all
 
+xlick-package:
+	cd lisp && $(MAKE) EMACS="$(XEMACS)" \
+	lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" all
+
 xinfo:
 	cd texi && $(MAKE) EMACS="$(XEMACS)" all-info
 
 xinfo-ja:
 	cd texi && $(MAKE) EMACS="$(XEMACS)" ja-info
 
+uninstall:
+	cd lisp && $(MAKE) lispdir="$(lispdir)" uninstall
+	cd texi && $(MAKE) uninstall
+	cd etc && $(MAKE) uninstall
+
+GNUS-NEWS: texi/gnus-news.texi
+	cd texi && $(MAKE) GNUS-NEWS
+
 # Rule for Lars and nobody else.
 some:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" some
@@ -159,7 +199,7 @@ clean:
 	for i in lisp texi; do (cd $$i; $(MAKE) clean); done
 
 elclean:
-	cd lisp && rm -f *.elc auto-autoloads.el custom-load.el
+	cd lisp && rm -f *.elc auto-autoloads.el custom-load.el gnus-load.el
 
 x:
 	$(MAKE) EMACS="$(XEMACS)"
@@ -169,7 +209,7 @@ xsome:
 
 distclean: clean
 	rm -rf *~
-	for i in lisp texi; do (cd $$i; $(MAKE) distclean); done
+	for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) distclean); done
 	rm -f config.log config.status config.cache Makefile
 
 config.status: $(srcdir)/configure