Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-45

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-23
   Fix errors with image-file installation

2005-02-19  Miles Bader  <miles@gnu.org>

   * Makefile.in (all): Don't do sub-make in etc.
   * etc/Makefile.in (all): Remove target.
   * make.bat: Do image copies properly.

diff --git a/ChangeLog b/ChangeLog
index 6814e9b..fc38171 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-19  Miles Bader  <miles@gnu.org>
+
+       * 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 4dc760f..d5bc65a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,6 @@ EMACS = @EMACS@
 XEMACS = @EMACS@
 
 all: lick info
-       cd etc && $(MAKE) EMACS="$(EMACS)" all
 
 lick:
        cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 0cee645..d8cdfce 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -13,9 +13,6 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 
-all: 
-       ln -s . images
-
 install: 
        $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)
        cd $(srcdir) \
@@ -25,13 +22,13 @@ install:
        done
        $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/gnus
        cd $(srcdir) \
-       && for p in gnus/*.xpm gnus/*.pbm gnus/*.xbm gnus/x-splash; do \
+       && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
          echo " $(INSTALL_DATA) $$p $(etcdir)/images/$$p"; \
          $(INSTALL_DATA) $$p $(etcdir)/images/$$p; \
        done
        $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/smilies
        cd $(srcdir) \
-       && for p in smilies/*.pbm smilies/*.xpm; do \
+       && for p in images/smilies/*.pbm images/smilies/*.xpm; do \
          echo " $(INSTALL_DATA) $$p $(etcdir)/images/$$p"; \
          $(INSTALL_DATA) $$p $(etcdir)/images/$$p; \
        done
@@ -39,7 +36,7 @@ install:
 uninstall: 
        rm -f $(etcdir)/gnus-tut.txt
        cd $(srcdir) \
-       && for p in gnus/*.xpm gnus/*.pbm gnus/*.xbm gnus/x-splash; do \
+       && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
          rm -f "$(etcdir)/images/$$p"; \
        done
        rmdir $(etcdir)/images/gnus 2> /dev/null || true

diff --git a/make.bat b/make.bat
index 20e7553..672284b 100644 (file)
--- a/make.bat
+++ b/make.bat
@@ -181,15 +181,18 @@ echo.
 echo Stand by while copying etc files.\r
 echo.\r
 if not exist %GNUS_ETC_DIR%\nul mkdir %GNUS_ETC_DIR%\r
-if not exist %GNUS_ETC_DIR%\images\nul mkdir %GNUS_ETC_DIR%\images\r
 xcopy /R /Q /Y gnus-tut.txt %GNUS_ETC_DIR%\r
 if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-tut-txt\r
-if not exist %GNUS_ETC_DIR%\images\gnus\nul mkdir %GNUS_ETC_DIR%\images\gnus\r
-xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\images\gnus\\r
+if not exist %GNUS_ETC_DIR%\gnus\nul mkdir %GNUS_ETC_DIR%\gnus\r
+xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\gnus\\r
 if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-*\r
+if not exist %GNUS_ETC_DIR%\images\nul mkdir %GNUS_ETC_DIR%\images\r
+if not exist %GNUS_ETC_DIR%\images\gnus\nul mkdir %GNUS_ETC_DIR%\images\gnus\r
+xcopy /R /Q /Y .\images\gnus\* %GNUS_ETC_DIR%\images\gnus\\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-gnus-*\r
 if not exist %GNUS_ETC_DIR%\images\smilies\nul mkdir %GNUS_ETC_DIR%\images\smilies\r
-xcopy /R /Q /Y .\smilies\* %GNUS_ETC_DIR%\images\smilies\\r
-if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-smilies-*\r
+xcopy /R /Q /Y .\images\smilies\* %GNUS_ETC_DIR%\images\smilies\\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-smilies-*\r
 goto warnings\r
 \r
 :nocopy\r