From f8388570302aad60379a3275fa81bfe475e76252 Mon Sep 17 00:00:00 2001
From: Tetsurou Okazaki <okazaki@be.to>
Date: Wed, 17 Mar 2010 22:17:11 -0700
Subject: [PATCH] Close bug#5720.

* Makefile.in, lib-src/Makefile.in (uninstall): Handle the case where
archlibdir does not exist.
---
 ChangeLog           | 5 +++++
 Makefile.in         | 4 +++-
 lib-src/ChangeLog   | 5 +++++
 lib-src/Makefile.in | 6 ++++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf162ddc200..a2ce0f1ad03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-18  Tetsurou Okazaki  <okazaki@be.to>  (tiny change)
+
+	* Makefile.in (uninstall): Handle the case where archlibdir does not
+	exist.  (Bug#5720)
+
 2010-03-12  Eli Zaretskii  <eliz@gnu.org>
 
 	These changes remove termcap.c from the build on Posix platforms.
diff --git a/Makefile.in b/Makefile.in
index 4c869cebf83..8942bc66878 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -667,7 +667,9 @@ uninstall:
 	    esac ;					\
 	  fi ;						\
 	done
-	(cd $(DESTDIR)${archlibdir} && rm -f fns-*)
+	if [ -d $(DESTDIR)${archlibdir} ]; then \
+	  (cd $(DESTDIR)${archlibdir} && rm -f fns-*) \
+	fi
 	-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
 	(cd $(DESTDIR)${infodir} && \
 	  for elt in $(INFO_FILES); do \
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0a05a066648..a6b003d2150 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-18  Tetsurou Okazaki  <okazaki@be.to>  (tiny change)
+
+	* Makefile.in (uninstall): Handle the case where archlibdir does not
+	exist.  (Bug#5720)
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Branch for 23.2.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index b1344c8b010..8a147038a4c 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -338,8 +338,10 @@ uninstall:
 	for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \
 	  rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
 	done)
-	(cd $(DESTDIR)${archlibdir}; \
-	 rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
+	if [ -d $(DESTDIR)${archlibdir} ]; then \
+	  (cd $(DESTDIR)${archlibdir} && \
+	   rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) \
+	fi
 
 mostlyclean:
 	-rm -f core *.o getopt.h getopt.h-t
-- 
2.39.2