X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=54cfddbb74048b6277b91987066dd5ba794b9c90;hb=4c8c30f98e1fcdea8252de88b37cc2b29940ee68;hp=69c491bd5d825bb663346d7068519ecede35d2f7;hpb=49d38b41c190eaab2cb34294fac7302a9c9ea353;p=elisp%2Fgnus.git-

diff --git a/Makefile.in b/Makefile.in
index 69c491b..54cfddb 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,10 +42,9 @@ all-ja: lick info info-ja
 lick:
 	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
 
-#install: install-lisp install-info install-etc
-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
@@ -60,22 +61,23 @@ install-info-ja:
 ## Rule for XEmacs package.
 install-package: \
 	xclever-package \
-	compose-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-package \
-	compose-package \
 	remove-extra-files-in-package \
 	install-package-lisp \
 	install-package-info install-package-info-ja \
+	install-package-etc \
 	install-package-manifest
 
-package: xlick-package xinfo compose-package
+package: xlick-package xinfo
 
-package-ja: xlick-package xinfo xinfo-ja compose-package
+package-ja: xlick-package xinfo xinfo-ja
 
 # Sub-rule for XEmacs package.
 install-package-lisp:
@@ -113,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)`; \
@@ -138,10 +151,6 @@ 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)" \
-	lispdir="$(PACKAGEDIR)/lisp/$(GNUS_PRODUCT_NAME)" compose-package
 ##
 
 xclever:
@@ -164,11 +173,20 @@ xinfo:
 xinfo-ja:
 	cd texi && $(MAKE) EMACS="$(XEMACS)" ja-info
 
+list-installed-shadows:
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" list-installed-shadows
+
+remove-installed-shadows:
+	cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" remove-installed-shadows
+
 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
@@ -182,9 +200,8 @@ info-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
+	for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) clean); done
+	rm -f *.orig *.rej *~ MANIFEST.*
 
 elclean:
 	cd lisp && rm -f *.elc auto-autoloads.el custom-load.el gnus-load.el
@@ -196,7 +213,6 @@ xsome:
 	$(MAKE) EMACS="$(XEMACS)" some
 
 distclean: clean
-	rm -rf *~
 	for i in lisp texi etc texi/ps; do (cd $$i; $(MAKE) distclean); done
 	rm -f config.log config.status config.cache Makefile