From 81af90607429e150c5e65c0bfc94cbf5c359678a Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 3 Mar 2006 12:02:31 +0000
Subject: Add DESTDIR variable to install and uninstall targets to support
 staged installations.

---
 lib-src/Makefile.in | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'lib-src')

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 33af87019e..85a7c13c95 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -285,11 +285,11 @@ blessmail:
 maybe-blessmail: BLESSMAIL
 #ifdef MOVEMAIL_NEEDS_BLESSING
 /* Don\'t charge ahead and do it!  Let the installer decide.
-	  ./blessmail ${archlibdir}/movemail${EXEEXT}  */
+	  ./blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}  */
 	@if [ `wc -l <blessmail` != 2 ] ; then \
 	  dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
 	  echo Assuming $$dir is really the mail spool directory, you should; \
-	  echo run  lib-src/blessmail ${archlibdir}/movemail${EXEEXT}; \
+	  echo run  lib-src/blessmail $(DESTDIR)${archlibdir}/movemail${EXEEXT}; \
 	  echo as root, to give  movemail${EXEEXT}  appropriate permissions.; \
 	  echo Do that after running  make install.; \
 	fi
@@ -297,50 +297,50 @@ maybe-blessmail: BLESSMAIL
 
 /* Install the internal utilities.  Until they are installed, we can
    just run them directly from lib-src.  */
-${archlibdir}: all
+$(DESTDIR)${archlibdir}: all
 	@echo
 	@echo "Installing utilities run internally by Emacs."
-	$(top_srcdir)/mkinstalldirs ${archlibdir}
-	if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)${archlibdir}
+	if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
 	  for file in ${UTILITIES}; do \
-	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file ${archlibdir}/$$file ; \
+	    $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \
 	  done ; \
         fi
-	$(top_srcdir)/mkinstalldirs ${gamedir}
-	touch ${gamedir}/snake-scores
-	touch ${gamedir}/tetris-scores
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}
+	touch $(DESTDIR)${gamedir}/snake-scores
+	touch $(DESTDIR)${gamedir}/tetris-scores
 /* If the following commands fail, that is not a big deal.
    update-game-score will detect at runtime that it is not setuid,
    and handle things accordingly. */
-	-if chown ${gameuser} ${archlibdir}/update-game-score && chmod u+s ${archlibdir}/update-game-score; then \
-	  chown ${gameuser} ${gamedir}; \
-	  chmod u=rwx,g=rwx,o=rx ${gamedir}; \
+	-if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \
+	  chown ${gameuser} $(DESTDIR)${gamedir}; \
+	  chmod u=rwx,g=rwx,o=rx $(DESTDIR)${gamedir}; \
 	fi
-        if [ `(cd ${archlibdir} && /bin/pwd)` \
+        if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` \
              != `(cd ${srcdir} && /bin/pwd)` ]; then \
 	  for file in ${SCRIPTS}; do \
-	    $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \
+	    $(INSTALL_PROGRAM) ${srcdir}/$$file $(DESTDIR)${archlibdir}/$$file; \
 	  done ; \
 	fi
 
-install: ${archlibdir}
+install: $(DESTDIR)${archlibdir}
 	@echo
 	@echo "Installing utilities for users to run."
 	for file in ${INSTALLABLES} ; do \
-	  $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
-	  chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
+	  $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
 	done
 	for file in ${INSTALLABLE_SCRIPTS} ; do \
-	  $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
-	  chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
+	  $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
+	  chmod a+rx $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
 	done
 
 uninstall:
-	(cd ${bindir}; \
+	(cd $(DESTDIR)${bindir}; \
 	for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \
-	  rm -f ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+	  rm -f $(DESTDIR)${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
 	done)
-	(cd ${archlibdir}; \
+	(cd $(DESTDIR)${archlibdir}; \
 	 rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
 
 mostlyclean:
-- 
cgit v1.2.3


From a6a2b5d4829b3329b8704062400d631d012e929c Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 3 Mar 2006 12:05:39 +0000
Subject: *** empty log message ***

---
 leim/ChangeLog    | 5 +++++
 lib-src/ChangeLog | 5 +++++
 lisp/ChangeLog    | 5 +++++
 3 files changed, 15 insertions(+)

(limited to 'lib-src')

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 6b83a88735..088e0b964e 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-03  Claudio Fontana  <claudio@gnu.org>
+
+	* Makefile.in: Add DESTDIR variable to install target to support
+	staged installations.
+
 2005-12-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in ($(TIT), leim-list.el): Warn that parts of
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index df8639f31f..46c22f8e05 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-23  Claudio Fontana  <claudio@gnu.org>
+
+	* Makefile.in: Add DESTDIR variable to install and uninstall
+	targets to support staged installations.
+
 2005-12-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (MOUSE_SUPPORT): Add tooltip.elc.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b0b99aeb2..d1210b331f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-23  Ken Manheimer  <ken.manheimer@gmail.com>
+
+	* emacs-lisp/edebug.el (edebug-display): Use `edebug-sit-for-seconds'
+	value instead of a literal constant (1) on more pauses.
+
 2006-03-03  Slawomir Nowaczyk  <slawomir.nowaczyk.847@student.lu.se>  (tiny change)
 
 	* textmodes/flyspell.el (flyspell-external-point-words): Be
-- 
cgit v1.2.3


From 9e2bcc86313f7a908c38fb431d8a0ba1eb2aebce Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 3 Mar 2006 12:07:45 +0000
Subject: Fix last entry.

---
 ChangeLog         | 4 ++--
 leim/ChangeLog    | 4 ++--
 lib-src/ChangeLog | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib-src')

diff --git a/ChangeLog b/ChangeLog
index 532e2441bc..50ba76a774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2006-03-03  Claudio Fontana  <claudio@gnu.org>
 
-	* Makefile.in: Add DESTDIR variable to install
-	and uninstall targets to support staged installations.
+	* Makefile.in (install, uninstall): Add DESTDIR variable to
+	support staged installations.
 
 2006-02-14  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 088e0b964e..589024ba86 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,7 +1,7 @@
 2006-03-03  Claudio Fontana  <claudio@gnu.org>
 
-	* Makefile.in: Add DESTDIR variable to install target to support
-	staged installations.
+	* Makefile.in (install): Add DESTDIR variable to support staged
+	installations.
 
 2005-12-17  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 46c22f8e05..e4e7403020 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,7 +1,7 @@
 2006-02-23  Claudio Fontana  <claudio@gnu.org>
 
-	* Makefile.in: Add DESTDIR variable to install and uninstall
-	targets to support staged installations.
+	* Makefile.in (install, uninstall): Add DESTDIR variable to
+	support staged installations.
 
 2005-12-30  Eli Zaretskii  <eliz@gnu.org>
 
-- 
cgit v1.2.3