X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.in;h=54cfddbb74048b6277b91987066dd5ba794b9c90;hb=5c254ad00d85c8bbbdf913af8dce0bb766bc8851;hp=d831bbe65ac59969ebcc7cb76e22eea72d6cfc8a;hpb=8f000d4d1d0ca9da362868f60fbda51a06f398d1;p=elisp%2Fgnus.git-

diff --git a/Makefile.in b/Makefile.in
index d831bbe..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
@@ -171,6 +173,12 @@ 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
@@ -192,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
@@ -206,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