diff options
author | Miles Bader <miles@gnu.org> | 2006-03-09 07:15:37 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-03-09 07:15:37 +0000 |
commit | b1af5d6a27620aacc93a9a34bc242488c15e668b (patch) | |
tree | 6f6fe2a93497d6149a5deb60dbd3e204315ed31b /leim | |
parent | 845df8100b62cafb758936ff333a0a1088d2220f (diff) | |
parent | 61e66a158a521e1ebdaa2e547dcc98d383674a75 (diff) |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-40
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 135-143)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 49-55)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: Makefile.in (release-*): New targets.
Diffstat (limited to 'leim')
-rw-r--r-- | leim/ChangeLog | 5 | ||||
-rw-r--r-- | leim/Makefile.in | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 6b83a887350..589024ba860 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,8 @@ +2006-03-03 Claudio Fontana <claudio@gnu.org> + + * Makefile.in (install): Add DESTDIR variable 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/leim/Makefile.in b/leim/Makefile.in index b6011ac6628..9e0364fd2d6 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -33,7 +33,7 @@ datadir=@datadir@ srcdir=@srcdir@ # Where to install LEIM files. -INSTALLDIR=${datadir}/emacs/${version}/leim +INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim GZIP_PROG = @GZIP_PROG@ |