From: yamaoka <yamaoka>
Date: Mon, 21 Feb 2005 07:53:34 +0000 (+0000)
Subject: * Makefile.in (install): Run install-etc.
X-Git-Tag: t-gnus-6_17_4-quimby-~549
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8f000d4d1d0ca9da362868f60fbda51a06f398d1;p=elisp%2Fgnus.git-

* Makefile.in (install): Run install-etc.
(install-ja): Ditto.
(install-package): Run install-package-etc.
(install-package-ja): Ditto.
(install-package-etc): New rule.

* lisp/dgnushack.el (dgnushack-install-package-manifest): List icon files.
---

diff --git a/ChangeLog b/ChangeLog
index 53ba5a8..cb3279c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* Makefile.in (install): Run install-etc.
+	(install-ja): Ditto.
+	(install-package): Run install-package-etc.
+	(install-package-ja): Ditto.
+	(install-package-etc): New rule.
+
+	* lisp/dgnushack.el (dgnushack-install-package-manifest): List
+	icon files.
+
 2005-02-19  Miles Bader  <miles@gnu.org>
 
 	* etc/Makefile.in (install): Create $(etcdir)/images/gnus dir.
diff --git a/Makefile.in b/Makefile.in
index 3c27759..d831bbe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,10 +40,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
@@ -62,13 +61,16 @@ 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-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
@@ -111,6 +113,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)`; \
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index bcf11f3..fb47b53 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -1,6 +1,6 @@
 ;;; dgnushack.el --- a hack to set the load path for byte-compiling
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;; 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Katsumi Yamaoka <yamaoka@jpl.org>
@@ -690,6 +690,22 @@ dgnushack-compile."
 				     t)
 		    'string-lessp))
 	(while (setq file (pop files))
-	  (insert "info/" file "\n"))))))
+	  (insert "info/" file "\n"))
+	(insert "etc/gnus-tut.txt\n")
+	(setq files
+	      (sort (directory-files "../etc/images/gnus/" nil
+				     "\\.\\(pbm\\|xbm\\|xpm\\)\\'"
+				     t)
+		    'string-lessp))
+	(while (setq file (pop files))
+	  (insert "etc/images/gnus/" file "\n"))
+	(insert "etc/images/gnus/x-splash\n")
+	(setq files
+	      (sort (directory-files "../etc/images/smilies/" nil
+				     "\\.\\(pbm\\|xpm\\)\\'"
+				     t)
+		    'string-lessp))
+	(while (setq file (pop files))
+	  (insert "etc/images/smilies/" file "\n"))))))
 
 ;;; dgnushack.el ends here