From: Miles Bader <miles@gnu.org>
Date: Sat, 19 Feb 2005 14:15:26 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-47
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=0d4863330c658e6ec43d6606e5bd0c33707a99de;p=gnus

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

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-25
   etc/Makefile.in (install, uninstall): Fix installed image dirs.

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

   * etc/Makefile.in (install, uninstall): Fix installed image dirs.
---

diff --git a/ChangeLog b/ChangeLog
index 31157ae6e..b1ad273b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 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.
diff --git a/etc/Makefile.in b/etc/Makefile.in
index f2ad7ac5b..772b6c52a 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -23,26 +23,26 @@ install:
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/gnus
 	cd $(srcdir) \
 	&& 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; \
+	  echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
+	  $(INSTALL_DATA) $$p $(etcdir)/$$p; \
 	done
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/smilies
 	cd $(srcdir) \
 	&& for p in images/smilies/*.pbm images/smilies/*.xpm; 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
 
 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 \
-	  rm -f "$(etcdir)/images/$$p"; \
+	  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