diff options
| author | Juanma Barranquero <[email protected]> | 2014-02-13 04:19:57 +0100 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2014-02-13 04:19:57 +0100 |
| commit | 1a4c95f6640b266c792254480947894088cb37d3 (patch) | |
| tree | 81c59365386cc9920154fab1ad36b89fbecaeb17 /nt | |
| parent | 0dab5068ae0b018133e3a95603ee21ff4ef4a88d (diff) | |
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.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/Makefile.in | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 4c20ce5be8..4c721c4eb7 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2014-02-13 Juanma Barranquero <[email protected]> + + * Makefile.in (datarootdir, datadir, INSTALL_DATA): Declare. + (install): Copy README.W32 to $(datadir)/emacs/$(version). + (uninstall): Remove README.W32. (Bug#14757) + 2014-02-08 Eli Zaretskii <[email protected]> * INSTALL: Update for Emacs 24.4. diff --git a/nt/Makefile.in b/nt/Makefile.in index ab657900dd..9564ec241a 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -56,6 +56,15 @@ exec_prefix=@exec_prefix@ # to `../configure'. bindir=@bindir@ +# The root of the directory tree for read-only architecture-independent +# data files. ${datadir}, ${infodir} and ${mandir} are based on this. +datarootdir=@datarootdir@ + +# Where to install architecture-independent data files. ${lispdir} +# and ${etcdir} are subdirectories of this. This is set with the +# --datadir option to `../configure'. +datadir=@datadir@ + # Where to install and expect executable files to be run by Emacs # rather than directly by users, and other architecture-dependent # data. ${archlibdir} is usually below this. This is set with the @@ -95,6 +104,7 @@ archlibdir=@archlibdir@ # ../configure figures out the correct values for these. INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ # By default, we uphold the dignity of our programs. @@ -161,8 +171,10 @@ install: $(DESTDIR)${archlibdir} for file in ${INSTALLABLES} ; do \ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ done + $(INSTALL_DATA) README.W32 "$(DESTDIR)${datadir}/emacs/$(version)" uninstall: + rm -f "$(DESTDIR)${datadir}/emacs/$(version)/README.W32" for file in ${INSTALLABLES}; do \ rm -f "$(DESTDIR)${bindir}"/`echo $${file} | sed -e 's/${EXEEXT}$$//' -e '$(TRANSFORM)'`${EXEEXT} ; \ done |