# HG changeset patch # User Glenn Morris # Date 1268889431 25200 # Node ID bc371c4be819eeb219f346fec019049096095992 # Parent b2cb35577e6eeda2a794cf18c3116b5dbac7ff6f Close bug#5720. * Makefile.in, lib-src/Makefile.in (uninstall): Handle the case where archlibdir does not exist. diff -r b2cb35577e6e -r bc371c4be819 ChangeLog --- a/ChangeLog Wed Mar 17 21:54:51 2010 -0700 +++ b/ChangeLog Wed Mar 17 22:17:11 2010 -0700 @@ -1,3 +1,8 @@ +2010-03-18 Tetsurou Okazaki (tiny change) + + * Makefile.in (uninstall): Handle the case where archlibdir does not + exist. (Bug#5720) + 2010-03-12 Eli Zaretskii These changes remove termcap.c from the build on Posix platforms. diff -r b2cb35577e6e -r bc371c4be819 Makefile.in --- a/Makefile.in Wed Mar 17 21:54:51 2010 -0700 +++ b/Makefile.in Wed Mar 17 22:17:11 2010 -0700 @@ -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 \ diff -r b2cb35577e6e -r bc371c4be819 lib-src/ChangeLog --- a/lib-src/ChangeLog Wed Mar 17 21:54:51 2010 -0700 +++ b/lib-src/ChangeLog Wed Mar 17 22:17:11 2010 -0700 @@ -1,3 +1,8 @@ +2010-03-18 Tetsurou Okazaki (tiny change) + + * Makefile.in (uninstall): Handle the case where archlibdir does not + exist. (Bug#5720) + 2010-03-10 Chong Yidong * Branch for 23.2. diff -r b2cb35577e6e -r bc371c4be819 lib-src/Makefile.in --- a/lib-src/Makefile.in Wed Mar 17 21:54:51 2010 -0700 +++ b/lib-src/Makefile.in Wed Mar 17 22:17:11 2010 -0700 @@ -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