bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Drew Adams]

I cannot find the file README.W32 in the MS Windows development binaries
distributed here:
https://www.dropbox.com/sh/zmxzw7pk2ml7qip/jS1Fuz1pZr
or here:
https://www.dropbox.com/sh/3pgcb3iiy8s9irl/c171Xhsd99

Dunno whether this is a problem generally or just with such builds.

According to info Eli sent me, the file exists in the repository but it
does not get copied into the installation tree, and that is a bug.


In GNU Emacs 24.3.50.1 (i686-pc-mingw32)
 of 2013-06-27 on ODIEONE
Bzr revision: 113205 dgutov@yandex.ru-20130627095155-f1lv1c7xf99g1sss
Windowing system distributor `Microsoft Corp.', version 6.1.7601
Configured using:
 `configure --prefix=/c/Devel/emacs/binary --enable-checking=yes,glyphs
 CFLAGS=-O0 -g3 LDFLAGS=-Lc:/Devel/emacs/lib
 CPPFLAGS=-Ic:/Devel/emacs/include'

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Juanma Barranquero]

On Sun, Jun 30, 2013 at 8:32 PM, Drew Adams <drew.adams@oracle.com> wrote:

> According to info Eli sent me, the file exists in the repository but it
> does not get copied into the installation tree, and that is a bug.

That file talks about the old binary distribution and should be
updated to refer to the MSYS build.

Also, what is the right place to copy this? At the root of the
installation tree?

   J

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Eli Zaretskii]

> From: Juanma Barranquero <lekktu@gmail.com>
> Date: Sun, 30 Jun 2013 22:11:12 +0200
> Cc: 14757@debbugs.gnu.org
> 
> Also, what is the right place to copy this? At the root of the
> installation tree?

I'd suggest in share/emacs/VERSION/, since that file can change from
version to version.

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Juanma Barranquero]

On Mon, Jul 1, 2013 at 4:43 AM, Eli Zaretskii <eliz@gnu.org> wrote:

> I'd suggest in share/emacs/VERSION/, since that file can change from
> version to version.

OK, I'll fix this one (sooner or later) unless you beat me to it.

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Lars Ingebrigtsen]

Juanma Barranquero <lekktu@gmail.com> writes:

> On Mon, Jul 1, 2013 at 4:43 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>
>> I'd suggest in share/emacs/VERSION/, since that file can change from
>> version to version.
>
> OK, I'll fix this one (sooner or later) unless you beat me to it.

Was this fixed in the MS Windows builds?

-- 
(domestic pets only, the antidote for overdose, milk.)
  bloggy blog http://lars.ingebrigtsen.no/

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: Eli Zaretskii <eliz@gnu.org>,  14757@debbugs.gnu.org,  Drew Adams <drew.adams@oracle.com>
> Date: Fri, 07 Feb 2014 22:37:18 -0800
> 
> Juanma Barranquero <lekktu@gmail.com> writes:
> 
> > On Mon, Jul 1, 2013 at 4:43 AM, Eli Zaretskii <eliz@gnu.org> wrote:
> >
> >> I'd suggest in share/emacs/VERSION/, since that file can change from
> >> version to version.
> >
> > OK, I'll fix this one (sooner or later) unless you beat me to it.
> 
> Was this fixed in the MS Windows builds?

No.

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Juanma Barranquero]

On Sat, Feb 8, 2014 at 10:35 AM, Eli Zaretskii <eliz@gnu.org> wrote:

>> Was this fixed in the MS Windows builds?
>
> No.

My fault, I had forgotten. I'll take a stab at it later today.

    J

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Eli Zaretskii]

> From: Juanma Barranquero <lekktu@gmail.com>
> Date: Sat, 8 Feb 2014 11:26:03 +0100
> Cc: Lars Ingebrigtsen <larsi@gnus.org>, 14757@debbugs.gnu.org, 
> 	Drew Adams <drew.adams@oracle.com>
> 
> On Sat, Feb 8, 2014 at 10:35 AM, Eli Zaretskii <eliz@gnu.org> wrote:
> 
> >> Was this fixed in the MS Windows builds?
> >
> > No.
> 
> My fault, I had forgotten. I'll take a stab at it later today.

Thanks.

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Juanma Barranquero]

Won't pretend that I know what I'm doing, but this patch seems to work
as expected.

Adding datarootdir to nt/Makefile.in is because adding datadir and not
datarootdir causes a warning when recreating the makefiles.

Comments?

=== modified file 'Makefile.in'
--- Makefile.in 2014-01-16 08:30:12 +0000
+++ Makefile.in 2014-02-10 16:29:22 +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/Makefile.in'
--- nt/Makefile.in 2014-01-01 07:43:34 +0000
+++ nt/Makefile.in 2014-02-10 17:32:34 +0000
@@ -56,6 +56,15 @@
 # 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 @@

 # ../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

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Eli Zaretskii]

> From: Juanma Barranquero <lekktu@gmail.com>
> Date: Mon, 10 Feb 2014 18:49:45 +0100
> Cc: Lars Ingebrigtsen <larsi@gnus.org>, 14757@debbugs.gnu.org, 
> 	Drew Adams <drew.adams@oracle.com>
> 
> Won't pretend that I know what I'm doing, but this patch seems to work
> as expected.
> 
> Adding datarootdir to nt/Makefile.in is because adding datadir and not
> datarootdir causes a warning when recreating the makefiles.
> 
> Comments?

None from me.  I suggest to wait for a couple of days, and if nothing
pops up, please commit.

Thanks.

bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds

[Juanma Barranquero]

On Mon, Feb 10, 2014 at 7:16 PM, Eli Zaretskii <eliz@gnu.org> wrote:

> I suggest to wait for a couple of days, and if nothing
> pops up, please commit.

Committed.