From: yamaoka <yamaoka>
Date: Sat, 19 Feb 2005 14:24:46 +0000 (+0000)
Subject: Synch to No Gnus 200502191415.
X-Git-Tag: t-gnus-6_17_4-quimby-~552
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa62c044ad9529f0d78ee8d182237a492e3877c7;p=elisp%2Fgnus.git-

Synch to No Gnus 200502191415.
---

diff --git a/ChangeLog b/ChangeLog
index ac867d7..a90f013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-19  Miles Bader  <miles@gnu.org>
+
+	* etc/Makefile.in (install, uninstall): Fix installed image dirs.
+
+	* etc/Makefile.in (install): Put gnus-tut.txt in the right place.
+
+	* Makefile.in (all): Don't do sub-make in etc.
+	* etc/Makefile.in (all): Remove target.
+
+	* make.bat: Do image copies properly.
+
 2005-02-18  Miles Bader  <miles@gnu.org>
 
 	Move all remaining images from etc/gnus to etc/images/gnus.
diff --git a/Makefile.in b/Makefile.in
index c3a3f50..3c27759 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,7 +34,6 @@ EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \
 	   (princ (or package-dir \"\")))" 2>/dev/null
 
 all: lick info
-	cd etc && $(MAKE) EMACS="$(EMACS)" all
 
 all-ja: lick info info-ja
 
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 0cee645..772b6c5 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -13,39 +13,36 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 
-all: 
-	ln -s . images
-
 install: 
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)
 	cd $(srcdir) \
 	&& for p in gnus-tut.txt; do \
-	  echo " $(INSTALL_DATA) $$p $(etcdir)/images/$$p"; \
-	  $(INSTALL_DATA) $$p $(etcdir)/images/$$p; \
+	  echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
+	  $(INSTALL_DATA) $$p $(etcdir)/$$p; \
 	done
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/gnus
 	cd $(srcdir) \
-	&& for p in gnus/*.xpm gnus/*.pbm gnus/*.xbm gnus/x-splash; do \
-	  echo " $(INSTALL_DATA) $$p $(etcdir)/images/$$p"; \
-	  $(INSTALL_DATA) $$p $(etcdir)/images/$$p; \
+	&& for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
+	  echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
+	  $(INSTALL_DATA) $$p $(etcdir)/$$p; \
 	done
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/smilies
 	cd $(srcdir) \
-	&& for p in smilies/*.pbm smilies/*.xpm; do \
-	  echo " $(INSTALL_DATA) $$p $(etcdir)/images/$$p"; \
-	  $(INSTALL_DATA) $$p $(etcdir)/images/$$p; \
+	&& for p in images/smilies/*.pbm images/smilies/*.xpm; do \
+	  echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
+	  $(INSTALL_DATA) $$p $(etcdir)/$$p; \
 	done
 
 uninstall: 
 	rm -f $(etcdir)/gnus-tut.txt
 	cd $(srcdir) \
-	&& for p in gnus/*.xpm gnus/*.pbm gnus/*.xbm gnus/x-splash; do \
-	  rm -f "$(etcdir)/images/$$p"; \
+	&& for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
+	  rm -f "$(etcdir)/$$p"; \
 	done
 	rmdir $(etcdir)/images/gnus 2> /dev/null || true
 	cd $(srcdir) \
-	&& for p in smilies/*.pbm smilies/*.xpm; do \
-	  rm -f "$(etcdir)/images/$$p"; \
+	&& for p in images/smilies/*.pbm images/smilies/*.xpm; do \
+	  rm -f "$(etcdir)/$$p"; \
 	done
 	rmdir $(etcdir)/images/smilies 2> /dev/null || true
 	rmdir $(etcdir)/images 2> /dev/null || true
diff --git a/make.bat b/make.bat
index 50722c6..8d865c8 100755
--- a/make.bat
+++ b/make.bat
@@ -181,15 +181,18 @@ echo.
 echo Stand by while copying etc files.
 echo.
 if not exist %GNUS_ETC_DIR%\nul mkdir %GNUS_ETC_DIR%
-if not exist %GNUS_ETC_DIR%\images\nul mkdir %GNUS_ETC_DIR%\images
 xcopy /R /Q /Y gnus-tut.txt %GNUS_ETC_DIR%
 if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-tut-txt
-if not exist %GNUS_ETC_DIR%\images\gnus\nul mkdir %GNUS_ETC_DIR%\images\gnus
-xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\images\gnus\
+if not exist %GNUS_ETC_DIR%\gnus\nul mkdir %GNUS_ETC_DIR%\gnus
+xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\gnus\
 if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-*
+if not exist %GNUS_ETC_DIR%\images\nul mkdir %GNUS_ETC_DIR%\images
+if not exist %GNUS_ETC_DIR%\images\gnus\nul mkdir %GNUS_ETC_DIR%\images\gnus
+xcopy /R /Q /Y .\images\gnus\* %GNUS_ETC_DIR%\images\gnus\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-gnus-*
 if not exist %GNUS_ETC_DIR%\images\smilies\nul mkdir %GNUS_ETC_DIR%\images\smilies
-xcopy /R /Q /Y .\smilies\* %GNUS_ETC_DIR%\images\smilies\
-if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-smilies-*
+xcopy /R /Q /Y .\images\smilies\* %GNUS_ETC_DIR%\images\smilies\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-smilies-*
 goto warnings
 
 :nocopy