diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:36:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:36:08 +0000 |
| commit | d0104e754a241cf83811fef30195d41201de533c (patch) | |
| tree | 6a5a31760801bd70649d0f9b132f61c46fac8445 /lispref | |
| parent | 19739b34866e6a4789d842961470123b50158612 (diff) | |
| parent | ab785936c82ac81edb8b20ac27c0558bc04797e5 (diff) | |
| download | emacs-d0104e754a241cf83811fef30195d41201de533c.tar.gz | |
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-486
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-487
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-488
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-489
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/gnus--rel--5.10--patch-156
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-157
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-158
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-159
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-160
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-587
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 7 | ||||
| -rw-r--r-- | lispref/Makefile.in | 4 | ||||
| -rw-r--r-- | lispref/makefile.w32-in | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 4400de92a0d..03359e1cd29 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,10 @@ +2006-10-29 Chong Yidong <cyd@stupidchicken.com> + + * Makefile.in: Use relative paths to avoid advertising filesystem + contents during compilation. + + * makefile.w32-in: Likewise. + 2006-10-23 Kim F. Storm <storm@cua.dk> * commands.texi (Event Input Misc): Update unread-command-events. diff --git a/lispref/Makefile.in b/lispref/Makefile.in index 1eea23e122e..e32a99e6e98 100644 --- a/lispref/Makefile.in +++ b/lispref/Makefile.in @@ -26,7 +26,7 @@ srcdir = @srcdir@ # Tell make where to find source files; this is needed for the makefiles. VPATH=@srcdir@ -infodir = $(srcdir)/../info +infodir = ../info usermanualdir = $(srcdir)/../man TEXI2DVI = texi2dvi @@ -101,7 +101,7 @@ srcs = \ info: $(infodir)/elisp $(infodir)/elisp: $(srcs) - $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp + cd $(srcdir); $(MAKEINFO) -I. -I$(infodir) elisp.texi -o $(infodir)/elisp elisp.dvi: $(srcs) $(TEXI2DVI) -I $(srcdir) -I $(usermanualdir) $(srcdir)/elisp.texi diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in index 7da88058bd5..93bb5ae6d45 100644 --- a/lispref/makefile.w32-in +++ b/lispref/makefile.w32-in @@ -22,7 +22,7 @@ # Standard configure variables. srcdir = . -infodir = $(srcdir)/../info +infodir = ../info usermanualdir = $(srcdir)/../man # Redefine `TEX' if `tex' does not invoke plain TeX. For example: @@ -106,7 +106,7 @@ $(infodir)/dir: $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp $(infodir)/elisp: $(srcs) - $(MAKEINFO) -I. -I$(srcdir) -o $(infodir)/elisp $(srcdir)/elisp.texi + cd $(srcdir); $(MAKEINFO) -I. -I$(infodir) elisp.texi -o $(infodir)/elisp elisp.dvi: $(srcs) $(texinputdir) $(TEX) -I $(usermanualdir) $(srcdir)/elisp.texi |