Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
ac1a0ce1
Commit
ac1a0ce1
authored
Jun 21, 2012
by
Glenn Morris
Browse files
Options
Browse Files
Download
Plain Diff
Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd@gnu.org
parents
6b67c0d4
2fecccba
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
141 additions
and
122 deletions
+141
-122
doc/emacs/ChangeLog
doc/emacs/ChangeLog
+4
-0
doc/emacs/Makefile.in
doc/emacs/Makefile.in
+7
-6
doc/lispintro/ChangeLog
doc/lispintro/ChangeLog
+4
-0
doc/lispintro/Makefile.in
doc/lispintro/Makefile.in
+7
-6
doc/lispref/ChangeLog
doc/lispref/ChangeLog
+4
-0
doc/lispref/Makefile.in
doc/lispref/Makefile.in
+7
-6
doc/misc/ChangeLog
doc/misc/ChangeLog
+4
-0
doc/misc/Makefile.in
doc/misc/Makefile.in
+104
-104
No files found.
doc/emacs/ChangeLog
View file @
ac1a0ce1
2012-06-21 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)
2012-06-17 Chong Yidong <cyd@gnu.org>
* emacs.texi: Remove urlcolor setting. Update ISBN and edition number.
...
...
doc/emacs/Makefile.in
View file @
ac1a0ce1
...
...
@@ -31,7 +31,7 @@ version=@version@
## This is a bit funny. Because the info files are in the
## distribution tarfiles, they are always made in $scrdir/../../info,
## even for out-of-tree builds.
infodir
=
$(srcdir)
/../../info
build
infodir
=
$(srcdir)
/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir
=
$(srcdir)
/../misc
...
...
@@ -121,11 +121,11 @@ EMACSSOURCES= \
## This seems pointless. The info/ directory exists in both the
## repository and the release tarfiles.
mkinfodir
=
@
${MKDIR_P}
${infodir}
mkinfodir
=
@
${MKDIR_P}
${
build
infodir}
.PHONY
:
info dvi html pdf ps
info
:
$(infodir)/emacs$(INFO_EXT)
info
:
$(
build
infodir)/emacs$(INFO_EXT)
dvi
:
emacs.dvi
html
:
emacs.html
pdf
:
emacs.pdf
...
...
@@ -135,7 +135,7 @@ ps: emacs.ps
# There is no provision for Info files to exist in the build directory.
# In a distribution of Emacs, the Info files should be up to date.
# Note: "<" is not portable in ordinary make rules.
$(infodir)/emacs$(INFO_EXT)
:
${EMACSSOURCES}
$(
build
infodir)/emacs$(INFO_EXT)
:
${EMACSSOURCES}
$(mkinfodir)
$(MAKEINFO)
$(MAKEINFO_OPTS)
$(INFO_OPTS)
-o
$@
${srcdir}
/emacs.texi
...
...
@@ -178,7 +178,7 @@ distclean: clean
## In the standalone tarfile, the clean rule runs this.
infoclean
:
-
cd
$(infodir)
&&
rm
-f
emacs
$(INFO_EXT)
emacs
$(INFO_EXT)
-[1-9] emacs
$(INFO_EXT)
-[1-9][0-9]
-
cd
$(
build
infodir)
&&
rm
-f
emacs
$(INFO_EXT)
emacs
$(INFO_EXT)
-[1-9] emacs
$(INFO_EXT)
-[1-9][0-9]
maintainer-clean
:
distclean infoclean
...
...
@@ -192,7 +192,8 @@ dist:
cp
${srcdir}
/
*
.texi
${texinfodir}
/texinfo.tex
\
${srcdir}
/ChangeLog
*
emacs-manual-
${version}
/
sed
-e
's/@sr[c]dir@/./'
-e
's/^\(texinfodir *=\).*/\1 ./'
\
-e
's/^\(infodir *=\).*/\1 ./'
-e
's/^\(clean:.*\)/\1 infoclean/'
\
-e
's/^\(buildinfodir *=\).*/\1 ./'
\
-e
's/^\(clean:.*\)/\1 infoclean/'
\
-e
"s/@ver[s]ion@/
${version}
/"
\
${srcdir}
/Makefile.in
>
emacs-manual-
${version}
/Makefile
tar
-cf
emacs-manual-
${version}
.tar emacs-manual-
${version}
...
...
doc/lispintro/ChangeLog
View file @
ac1a0ce1
2012-06-21 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)
2012-05-29 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi: Nuke hand-written node pointers.
...
...
doc/lispintro/Makefile.in
View file @
ac1a0ce1
...
...
@@ -22,7 +22,7 @@ SHELL = /bin/sh
srcdir
=
@srcdir@
version
=
@version@
infodir
=
$(srcdir)
/../../info
build
infodir
=
$(srcdir)
/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir
=
$(srcdir)
/../misc
...
...
@@ -41,11 +41,11 @@ DVIPS = dvips
ENVADD
=
TEXINPUTS
=
"
$(srcdir)
:
$(texinfodir)
:
$(TEXINPUTS)
"
\
MAKEINFO
=
"
$(MAKEINFO)
$(MAKEINFO_OPTS)
"
mkinfodir
=
@
${MKDIR_P}
${infodir}
mkinfodir
=
@
${MKDIR_P}
${
build
infodir}
.PHONY
:
info dvi html pdf ps
info
:
${infodir}/eintr$(INFO_EXT)
info
:
${
build
infodir}/eintr$(INFO_EXT)
dvi
:
emacs-lisp-intro.dvi
html
:
emacs-lisp-intro.html
...
...
@@ -55,7 +55,7 @@ ps: emacs-lisp-intro.ps
# The file name eintr must fit within 5 characters, to allow for
# -NN extensions to fit into DOS 8+3 limits without clashing.
# Note: "<" is not portable in ordinary make rules.
${infodir}/eintr$(INFO_EXT)
:
${srcdir}/emacs-lisp-intro.texi
${
build
infodir}/eintr$(INFO_EXT)
:
${srcdir}/emacs-lisp-intro.texi
$(mkinfodir)
$(MAKEINFO)
$(MAKEINFO_OPTS)
$(INFO_OPTS)
-o
$@
${srcdir}
/emacs-lisp-intro.texi
...
...
@@ -85,7 +85,7 @@ clean: mostlyclean
distclean
:
clean
infoclean
:
-
cd
$(infodir)
&&
rm
-f
eintr
$(INFO_EXT)
eintr
$(INFO_EXT)
-[1-9]
-
cd
$(
build
infodir)
&&
rm
-f
eintr
$(INFO_EXT)
eintr
$(INFO_EXT)
-[1-9]
maintainer-clean
:
distclean infoclean
...
...
@@ -98,7 +98,8 @@ dist:
${texinfodir}
/texinfo.tex
\
${srcdir}
/ChangeLog
*
${srcdir}
/README emacs-lispintro-
${version}
/
sed
-e
's/@sr[c]dir@/./'
-e
's/^\(texinfodir *=\).*/\1 ./'
\
-e
's/^\(infodir *=\).*/\1 ./'
-e
's/^\(clean:.*\)/\1 infoclean/'
\
-e
's/^\(buildinfodir *=\).*/\1 ./'
\
-e
's/^\(clean:.*\)/\1 infoclean/'
\
-e
"s/@ver[s]ion@/
${version}
/"
\
${srcdir}
/Makefile.in
>
emacs-lispintro-
${version}
/Makefile
tar
-cf
emacs-lispintro-
${version}
.tar emacs-lispintro-
${version}
...
...
doc/lispref/ChangeLog
View file @
ac1a0ce1
2012-06-21 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)
2012-06-18 Stefan Monnier <monnier@iro.umontreal.ca>
* functions.texi (Defining Functions):
...
...
doc/lispref/Makefile.in
View file @
ac1a0ce1
...
...
@@ -24,7 +24,7 @@ srcdir = @srcdir@
version
=
@version@
infodir
=
$(srcdir)
/../../info
build
infodir
=
$(srcdir)
/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir
=
$(srcdir)
/../misc
# Directory with emacsver.texi.
...
...
@@ -101,18 +101,18 @@ srcs = \
$(srcdir)
/gpl.texi
\
$(srcdir)
/doclicense.texi
mkinfodir
=
@
${MKDIR_P}
${infodir}
mkinfodir
=
@
${MKDIR_P}
${
build
infodir}
.PHONY
:
info dvi pdf ps
info
:
$(infodir)/elisp$(INFO_EXT)
info
:
$(
build
infodir)/elisp$(INFO_EXT)
dvi
:
elisp.dvi
html
:
elisp.html
pdf
:
elisp.pdf
ps
:
elisp.ps
## Note: "<" is not portable in ordinary make rules.
$(infodir)/elisp$(INFO_EXT)
:
$(srcs)
$(
build
infodir)/elisp$(INFO_EXT)
:
$(srcs)
$(mkinfodir)
$(MAKEINFO)
$(MAKEINFO_OPTS)
$(INFO_OPTS)
-o
$@
$(srcdir)
/elisp.texi
...
...
@@ -145,7 +145,7 @@ clean: mostlyclean
distclean
:
clean
infoclean
:
-
cd
$(infodir)
&&
rm
-f
elisp
$(INFO_EXT)
elisp
$(INFO_EXT)
-[1-9] elisp
$(INFO_EXT)
-[1-9][0-9]
-
cd
$(
build
infodir)
&&
rm
-f
elisp
$(INFO_EXT)
elisp
$(INFO_EXT)
-[1-9] elisp
$(INFO_EXT)
-[1-9][0-9]
maintainer-clean
:
distclean infoclean
...
...
@@ -160,7 +160,8 @@ dist:
${srcdir}
/README emacs-lispref-
${version}
/
sed
-e
's/@sr[c]dir@/./'
-e
's/^\(texinfodir *=\).*/\1 ./'
\
-e
's/^\(emacsdir *=\).*/\1 ./'
\
-e
's/^\(infodir *=\).*/\1 ./'
-e
's/^\(clean:.*\)/\1 infoclean/'
\
-e
's/^\(buildinfodir *=\).*/\1 ./'
\
-e
's/^\(clean:.*\)/\1 infoclean/'
\
-e
"s/@ver[s]ion@/
${version}
/"
\
${srcdir}
/Makefile.in
>
emacs-lispref-
${version}
/Makefile
tar
-cf
emacs-lispref-
${version}
.tar emacs-lispref-
${version}
...
...
doc/misc/ChangeLog
View file @
ac1a0ce1
2012-06-21 Glenn Morris <rgm@gnu.org>
* Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737)
2012-06-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.texi (Group Timestamp): Mention where to find documentation for
...
...
doc/misc/Makefile.in
View file @
ac1a0ce1
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment