diff options
| author | Juanma Barranquero | 2014-02-13 04:19:57 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2014-02-13 04:19:57 +0100 |
| commit | 1a4c95f6640b266c792254480947894088cb37d3 (patch) | |
| tree | 81c59365386cc9920154fab1ad36b89fbecaeb17 | |
| parent | 0dab5068ae0b018133e3a95603ee21ff4ef4a88d (diff) | |
| download | emacs-1a4c95f6640b266c792254480947894088cb37d3.tar.gz emacs-1a4c95f6640b266c792254480947894088cb37d3.zip | |
Copy README.W32 when installing Windows build (bug#14757).
* Makefile.in (install-nt): Also pass datadir.
* nt/Makefile.in (datarootdir, datadir, INSTALL_DATA): Declare.
(install): Copy README.W32 to $(datadir)/emacs/$(version).
(uninstall): Remove README.W32.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/Makefile.in | 12 |
4 files changed, 23 insertions, 0 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-02-13 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * Makefile.in (install-nt): Also pass datadir. | ||
| 4 | |||
| 1 | 2014-02-05 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2014-02-05 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Merge from gnulib, incorporating: | 7 | Merge from gnulib, incorporating: |
diff --git a/Makefile.in b/Makefile.in index e69998e3e52..192c9483eb0 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -510,6 +510,7 @@ install-nt: | |||
| 510 | $(MAKE) install $(MFLAGS) prefix="${prefix}" \ | 510 | $(MAKE) install $(MFLAGS) prefix="${prefix}" \ |
| 511 | exec_prefix="${exec_prefix}" bindir="${bindir}" \ | 511 | exec_prefix="${exec_prefix}" bindir="${bindir}" \ |
| 512 | libexecdir="${libexecdir}" archlibdir="${archlibdir}" \ | 512 | libexecdir="${libexecdir}" archlibdir="${archlibdir}" \ |
| 513 | datadir="${datadir}" \ | ||
| 513 | INSTALL_STRIP=${INSTALL_STRIP} | 514 | INSTALL_STRIP=${INSTALL_STRIP} |
| 514 | 515 | ||
| 515 | ## In the share directory, we are deleting: | 516 | ## In the share directory, we are deleting: |
diff --git a/nt/ChangeLog b/nt/ChangeLog index 4c20ce5be81..4c721c4eb73 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-02-13 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * Makefile.in (datarootdir, datadir, INSTALL_DATA): Declare. | ||
| 4 | (install): Copy README.W32 to $(datadir)/emacs/$(version). | ||
| 5 | (uninstall): Remove README.W32. (Bug#14757) | ||
| 6 | |||
| 1 | 2014-02-08 Eli Zaretskii <eliz@gnu.org> | 7 | 2014-02-08 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * INSTALL: Update for Emacs 24.4. | 9 | * INSTALL: Update for Emacs 24.4. |
diff --git a/nt/Makefile.in b/nt/Makefile.in index ab657900dd8..9564ec241a5 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in | |||
| @@ -56,6 +56,15 @@ exec_prefix=@exec_prefix@ | |||
| 56 | # to `../configure'. | 56 | # to `../configure'. |
| 57 | bindir=@bindir@ | 57 | bindir=@bindir@ |
| 58 | 58 | ||
| 59 | # The root of the directory tree for read-only architecture-independent | ||
| 60 | # data files. ${datadir}, ${infodir} and ${mandir} are based on this. | ||
| 61 | datarootdir=@datarootdir@ | ||
| 62 | |||
| 63 | # Where to install architecture-independent data files. ${lispdir} | ||
| 64 | # and ${etcdir} are subdirectories of this. This is set with the | ||
| 65 | # --datadir option to `../configure'. | ||
| 66 | datadir=@datadir@ | ||
| 67 | |||
| 59 | # Where to install and expect executable files to be run by Emacs | 68 | # Where to install and expect executable files to be run by Emacs |
| 60 | # rather than directly by users, and other architecture-dependent | 69 | # rather than directly by users, and other architecture-dependent |
| 61 | # data. ${archlibdir} is usually below this. This is set with the | 70 | # data. ${archlibdir} is usually below this. This is set with the |
| @@ -95,6 +104,7 @@ archlibdir=@archlibdir@ | |||
| 95 | 104 | ||
| 96 | # ../configure figures out the correct values for these. | 105 | # ../configure figures out the correct values for these. |
| 97 | INSTALL = @INSTALL@ | 106 | INSTALL = @INSTALL@ |
| 107 | INSTALL_DATA = @INSTALL_DATA@ | ||
| 98 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ | 108 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
| 99 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | 109 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
| 100 | # By default, we uphold the dignity of our programs. | 110 | # By default, we uphold the dignity of our programs. |
| @@ -161,8 +171,10 @@ install: $(DESTDIR)${archlibdir} | |||
| 161 | for file in ${INSTALLABLES} ; do \ | 171 | for file in ${INSTALLABLES} ; do \ |
| 162 | $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ | 172 | $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ |
| 163 | done | 173 | done |
| 174 | $(INSTALL_DATA) README.W32 "$(DESTDIR)${datadir}/emacs/$(version)" | ||
| 164 | 175 | ||
| 165 | uninstall: | 176 | uninstall: |
| 177 | rm -f "$(DESTDIR)${datadir}/emacs/$(version)/README.W32" | ||
| 166 | for file in ${INSTALLABLES}; do \ | 178 | for file in ${INSTALLABLES}; do \ |
| 167 | rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ | 179 | rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ |
| 168 | done | 180 | done |