Close bug#5720.

* Makefile.in, lib-src/Makefile.in (uninstall): Handle the case where
archlibdir does not exist.

diff --git a/ChangeLog b/ChangeLog
index cf162dd..a2ce0f1 100644 (file)
--- 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 4c869ce..8942bc6 100644 (file)
--- 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 0a05a06..a6b003d 100644 (file)
--- 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 b1344c8..8a14703 100644 (file)
--- 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