[Emacs-diffs] trunk r116425: Copy README.W32 when installing Windows build (bug#14757).

[Juanma Barranquero]

------------------------------------------------------------
revno: 116425
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14757
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-13 04:19:57 +0100
message:
  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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  Makefile.in                    makefile.in-20091113204419-o5vbwnq5f7feedwu-446
  nt/ChangeLog                   changelog-20091113204419-o5vbwnq5f7feedwu-1545
  nt/Makefile.in                 makefile.in-20130401120038-v7du7ljz2h0zkbc6-1

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-02-05 19:41:03 +0000
+++ b/ChangeLog 2014-02-13 03:19:57 +0000
@@ -1,3 +1,7 @@
+2014-02-13  Juanma Barranquero  <address@hidden>
+
+       * Makefile.in (install-nt): Also pass datadir.
+
 2014-02-05  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'Makefile.in'
--- a/Makefile.in       2014-01-16 08:30:12 +0000
+++ b/Makefile.in       2014-02-13 03:19:57 +0000
@@ -510,6 +510,7 @@
          $(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:

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2014-02-08 10:25:33 +0000
+++ b/nt/ChangeLog      2014-02-13 03:19:57 +0000
@@ -1,3 +1,9 @@
+2014-02-13  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * INSTALL: Update for Emacs 24.4.

=== modified file 'nt/Makefile.in'
--- a/nt/Makefile.in    2014-01-01 07:43:34 +0000
+++ b/nt/Makefile.in    2014-02-13 03:19:57 +0000
@@ -56,6 +56,15 @@
 # to `../configure'.
 address@hidden@
 
+# The root of the directory tree for read-only architecture-independent
+# data files.  ${datadir}, ${infodir} and ${mandir} are based on this.
address@hidden@
+
+# Where to install architecture-independent data files.  ${lispdir}
+# and ${etcdir} are subdirectories of this.  This is set with the
+# --datadir option to `../configure'.
address@hidden@
+
 # 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 @@
 
 # ../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 @@
        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