diff options
| author | Tetsurou Okazaki | 2010-03-17 22:17:11 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-03-17 22:17:11 -0700 |
| commit | f8388570302aad60379a3275fa81bfe475e76252 (patch) | |
| tree | 078f75db142111e434dbcd7f8b849105f971e0e5 /lib-src | |
| parent | 04525749772d5a7d0c6ca0ea8b36104dc25a3e18 (diff) | |
| download | emacs-f8388570302aad60379a3275fa81bfe475e76252.tar.gz emacs-f8388570302aad60379a3275fa81bfe475e76252.zip | |
Close bug#5720.
* Makefile.in, lib-src/Makefile.in (uninstall): Handle the case where
archlibdir does not exist.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 6 |
2 files changed, 9 insertions, 2 deletions
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 @@ | |||
| 1 | 2010-03-18 Tetsurou Okazaki <okazaki@be.to> (tiny change) | ||
| 2 | |||
| 3 | * Makefile.in (uninstall): Handle the case where archlibdir does not | ||
| 4 | exist. (Bug#5720) | ||
| 5 | |||
| 1 | 2010-03-10 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-03-10 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * Branch for 23.2. | 8 | * 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: | |||
| 338 | for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \ | 338 | for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \ |
| 339 | rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ | 339 | rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \ |
| 340 | done) | 340 | done) |
| 341 | (cd $(DESTDIR)${archlibdir}; \ | 341 | if [ -d $(DESTDIR)${archlibdir} ]; then \ |
| 342 | rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) | 342 | (cd $(DESTDIR)${archlibdir} && \ |
| 343 | rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) \ | ||
| 344 | fi | ||
| 343 | 345 | ||
| 344 | mostlyclean: | 346 | mostlyclean: |
| 345 | -rm -f core *.o getopt.h getopt.h-t | 347 | -rm -f core *.o getopt.h getopt.h-t |