bug#5720: 24.0.50; make uninstall removes some files under lib-src if $(DESTDIR)${archlibdir} is not exist

bug#5720: 24.0.50; make uninstall removes some files under lib-src if $(DESTDIR)${archlibdir} is not exist

[Tetsurou Okazaki]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]


Running `make uninstall' deletes some script files under lib-src
when a corresponding $(DESTDIR)${archlibdir} is not exist, since
the uninstall rule does not check the status of `cd $(DESTDIR)${archlibdir}'.

To reproduce this condition:

  extract or check out the emacs source tree at the machine Emacs is not installed
  or
  update the source tree until `emacs-version' is updated to the one not installed yet

  then

  % ./configure
  % make uninstall


Please apply the attached patch to fix this.
It also avoids `make uninstall' stops when `cd $(DESTDIR)${archlibdir}' fails.



[-- Attachment #2: emacs-uninstall-fix.diff --]
[-- Type: application/octet-stream, Size: 1510 bytes --]

=== modified file 'Makefile.in'
*** Makefile.in	2010-01-13 08:35:10 +0000
--- Makefile.in	2010-03-01 11:33:10 +0000
***************
*** 667,673 ****
  	    esac ;					\
  	  fi ;						\
  	done
! 	(cd $(DESTDIR)${archlibdir} && rm -f fns-*)
  	-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
  	(cd $(DESTDIR)${infodir} && \
  	  for elt in $(INFO_FILES); do \
--- 667,675 ----
  	    esac ;					\
  	  fi ;						\
  	done
! 	if [ -d $(DESTDOR)${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/Makefile.in'
*** lib-src/Makefile.in	2010-01-13 08:35:10 +0000
--- lib-src/Makefile.in	2010-03-10 22:44:29 +0000
***************
*** 338,345 ****
  	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})
  
  mostlyclean:
  	-rm -f core *.o getopt.h getopt.h-t
--- 338,347 ----
  	for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \
  	  rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
  	done)
! 	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

bug#5720: 24.0.50; make uninstall removes some files under lib-src if $(DESTDIR)${archlibdir} is not exist

[Glenn Morris]

Tetsurou Okazaki wrote:

> Please apply the attached patch to fix this.

Thank you, applied to the trunk.

You have a few small changes in Emacs now, and should probably
complete a copyright assignment if you expect to send any more. There
is a simple form to fill out - let me know if I should send it to you.