From: Juanma Barranquero <lekktu@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 14757@debbugs.gnu.org, Lars Ingebrigtsen <larsi@gnus.org>
Subject: bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds
Date: Mon, 10 Feb 2014 18:49:45 +0100 [thread overview]
Message-ID: <CAAeL0SSsBzLr5G_YhQorjyaQ7Q2Xd4u-Voi_FAzBd_H4Z_ebFg@mail.gmail.com> (raw)
In-Reply-To: <83iospx45n.fsf@gnu.org>
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
next prev parent reply other threads:[~2014-02-10 17:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-30 18:32 bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds Drew Adams
2013-06-30 20:11 ` Juanma Barranquero
2013-07-01 2:43 ` Eli Zaretskii
2013-07-01 3:08 ` Juanma Barranquero
2014-02-08 6:37 ` Lars Ingebrigtsen
2014-02-08 9:35 ` Eli Zaretskii
2014-02-08 10:26 ` Juanma Barranquero
2014-02-08 10:57 ` Eli Zaretskii
2014-02-10 17:49 ` Juanma Barranquero [this message]
2014-02-10 18:16 ` Eli Zaretskii
2014-02-13 3:21 ` Juanma Barranquero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAAeL0SSsBzLr5G_YhQorjyaQ7Q2Xd4u-Voi_FAzBd_H4Z_ebFg@mail.gmail.com \
--to=lekktu@gmail.com \
--cc=14757@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=larsi@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.