Mercurial > emacs
changeset 107405:bc371c4be819
Close bug#5720.
* Makefile.in, lib-src/Makefile.in (uninstall): Handle the case where
archlibdir does not exist.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 17 Mar 2010 22:17:11 -0700 |
| parents | b2cb35577e6e |
| children | 1de48da1419b |
| files | ChangeLog Makefile.in lib-src/ChangeLog lib-src/Makefile.in |
| diffstat | 4 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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.
--- 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 \
--- 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 <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.
--- 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