GNU bug report logs - #14757
24.3.50; cannot find README.W32 in MS Windows builds

Previous Next

Full log

View this message in rfc822 format

From: Juanma Barranquero <lekktu <at> gmail.com>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 14757 <at> debbugs.gnu.org, Lars Ingebrigtsen <larsi <at> gnus.org>, Drew Adams <drew.adams <at> oracle.com>
Subject: bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds
Date: Mon, 10 Feb 2014 18:49:45 +0100

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.