[Emacs-diffs] /srv/bzr/emacs/trunk r99671: Close bug#5720.

[Glenn Morris]

------------------------------------------------------------
revno: 99671
author: Tetsurou Okazaki <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-03-17 22:17:11 -0700
message:
  Close bug#5720.
  
  * Makefile.in, lib-src/Makefile.in (uninstall): Handle the case where
  archlibdir does not exist.
modified:
  ChangeLog
  Makefile.in
  lib-src/ChangeLog
  lib-src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-03-13 08:52:05 +0000
+++ b/ChangeLog 2010-03-18 05:17:11 +0000
@@ -1,3 +1,8 @@
+2010-03-18  Tetsurou Okazaki  <address@hidden>  (tiny change)
+
+       * Makefile.in (uninstall): Handle the case where archlibdir does not
+       exist.  (Bug#5720)
+
 2010-03-12  Eli Zaretskii  <address@hidden>
 
        These changes remove termcap.c from the build on Posix platforms.

=== modified file 'Makefile.in'
--- a/Makefile.in       2010-01-13 08:35:10 +0000
+++ b/Makefile.in       2010-03-18 05:17:11 +0000
@@ -667,7 +667,9 @@
            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 \

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-03-10 15:17:13 +0000
+++ b/lib-src/ChangeLog 2010-03-18 05:17:11 +0000
@@ -1,3 +1,8 @@
+2010-03-18  Tetsurou Okazaki  <address@hidden>  (tiny change)
+
+       * Makefile.in (uninstall): Handle the case where archlibdir does not
+       exist.  (Bug#5720)
+
 2010-03-10  Chong Yidong  <address@hidden>
 
        * Branch for 23.2.

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2010-01-13 08:35:10 +0000
+++ b/lib-src/Makefile.in       2010-03-18 05:17:11 +0000
@@ -338,8 +338,10 @@
        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