diff options
| author | Joakim Verona | 2013-08-15 08:47:50 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-15 08:47:50 +0200 |
| commit | 7a263a505d444370bcd2f8d8d5231396d5152c7a (patch) | |
| tree | fc6b7be10a46d49c2b436353a5fd4356bc5b3ccb /admin | |
| parent | 6c21e9fe3cf487045bdf660e5400e2b9a7d6555f (diff) | |
| parent | 8e5c7e6f4ee3598ea329f6a83c6d4d118cef7589 (diff) | |
| download | emacs-7a263a505d444370bcd2f8d8d5231396d5152c7a.tar.gz emacs-7a263a505d444370bcd2f8d8d5231396d5152c7a.zip | |
merge from trunk
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/make-tarball.txt | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 36454ccb314..e9c6c74e163 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * make-tarball.txt: Mention generating pdfs in etc/refcards. | ||
| 4 | |||
| 1 | 2013-08-15 Xue Fuqiao <xfq.free@gmail.com> | 5 | 2013-08-15 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 6 | ||
| 3 | * notes/hydra: More information about Hydra. | 7 | * notes/hydra: More information about Hydra. |
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 3172854ede7..fc7f81f0c28 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt | |||
| @@ -61,6 +61,9 @@ General steps (for each step, check for possible errors): | |||
| 61 | 5. autoreconf -i -I m4 --force | 61 | 5. autoreconf -i -I m4 --force |
| 62 | make bootstrap | 62 | make bootstrap |
| 63 | 63 | ||
| 64 | make -C etc/refcards | ||
| 65 | make -C etc/refcards clean | ||
| 66 | |||
| 64 | 6. Copy lisp/loaddefs.el to lisp/ldefs-boot.el. | 67 | 6. Copy lisp/loaddefs.el to lisp/ldefs-boot.el. |
| 65 | 68 | ||
| 66 | Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed | 69 | Commit etc/AUTHORS, lisp/ldefs-boot.el, and the files changed |