* make.bat (:etc): Also consider images in images/mail and

images/.

* etc/Makefile.in (install, uninstall): Also consider images in
images/mail and images/.

diff --git a/ChangeLog b/ChangeLog
index 0eb460d..824f713 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-02-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * make.bat (:etc): Also consider images in images/mail and
+       images/.
+
+       * etc/Makefile.in (install, uninstall): Also consider images in
+       images/mail and images/.
+
        * etc/images/connect.xpm, etc/images/contact.xpm,
        etc/images/delete.xpm, etc/images/describe.xpm,
        etc/images/disconnect.xpm, etc/images/exit.xpm,

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 56ee05d..ff9967f 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -20,9 +20,12 @@ install:
          echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
          $(INSTALL_DATA) $$p $(etcdir)/$$p; \
        done
-       $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/gnus
+       $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/gnus $(etcdir)/images/mail
        cd $(srcdir) \
-       && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
+       && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm \
+                    images/mail/*.xpm images/mail/*.pbm \
+                    images/*.xpm images/*.pbm \
+                    images/gnus/x-splash; do \
          echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
          $(INSTALL_DATA) $$p $(etcdir)/$$p; \
        done
@@ -36,7 +39,10 @@ install:
 uninstall:
        rm -f $(etcdir)/gnus-tut.txt
        cd $(srcdir) \
-       && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm images/gnus/x-splash; do \
+       && for p in images/gnus/*.xpm images/gnus/*.pbm images/gnus/*.xbm \
+                    images/mail/*.xpm images/mail/*.pbm \
+                    images/*.xpm images/*.pbm \
+                    images/gnus/x-splash; do \
          rm -f "$(etcdir)/$$p"; \
        done
        rmdir $(etcdir)/images/gnus 2> /dev/null || true

diff --git a/make.bat b/make.bat
index 672284b..fe76a74 100644 (file)
--- a/make.bat
+++ b/make.bat
@@ -187,9 +187,14 @@ if not exist %GNUS_ETC_DIR%\gnus\nul mkdir %GNUS_ETC_DIR%\gnus
 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
+xcopy /R /Q /Y .\images\*.??? %GNUS_ETC_DIR%\images\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-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\mail\nul mkdir %GNUS_ETC_DIR%\images\mail\r
+xcopy /R /Q /Y .\images\mail\* %GNUS_ETC_DIR%\images\mail\\r
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-mail-*\r
 if not exist %GNUS_ETC_DIR%\images\smilies\nul mkdir %GNUS_ETC_DIR%\images\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