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.

diff --git a/ChangeLog b/ChangeLog
index 67d329620019460e1b1d8d31e95d4584d1dedf73..22f33b07b13fdc03e13c5255f45ec7a1e852452b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * Makefile.in (install-nt): Also pass datadir.
+
 2014-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:

diff --git a/Makefile.in b/Makefile.in
index e69998e3e524fb9753370f172ea440e7dd384cc2..192c9483eb0ec4ee6ed826e564d27adf06c23310 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -510,6 +510,7 @@ install-nt:
          $(MAKE) install $(MFLAGS) prefix="${prefix}" \
            exec_prefix="${exec_prefix}" bindir="${bindir}" \
            libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
+           datadir="${datadir}" \
            INSTALL_STRIP=${INSTALL_STRIP}
 
 ## In the share directory, we are deleting:

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4c20ce5be81beffe22f7ef11de255e6319c8520a..4c721c4eb73496f2e2b4f1df88537adf95de934f 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-13  Juanma Barranquero  <lekktu@gmail.com>
+
+       * 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  <eliz@gnu.org>
 
        * INSTALL: Update for Emacs 24.4.

diff --git a/nt/Makefile.in b/nt/Makefile.in
index ab657900dd86e3e4a6bca530506df581a4322118..9564ec241a5cd40e55b9a4627b037487016c2e5d 100644 (file)
--- 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