From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.bugs Subject: bug#14757: 24.3.50; cannot find README.W32 in MS Windows builds Date: Mon, 10 Feb 2014 18:49:45 +0100 Message-ID: References: <834ncfc85m.fsf@gnu.org> <877g96yush.fsf@building.gnus.org> <83siruvteu.fsf@gnu.org> <83iospx45n.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1392054672 3319 80.91.229.3 (10 Feb 2014 17:51:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 10 Feb 2014 17:51:12 +0000 (UTC) Cc: 14757@debbugs.gnu.org, Lars Ingebrigtsen To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 10 18:51:20 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WCv0k-0000gr-S5 for geb-bug-gnu-emacs@m.gmane.org; Mon, 10 Feb 2014 18:51:15 +0100 Original-Received: from localhost ([::1]:57071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCv0k-0004Lf-HO for geb-bug-gnu-emacs@m.gmane.org; Mon, 10 Feb 2014 12:51:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCv0d-0004Ko-3E for bug-gnu-emacs@gnu.org; Mon, 10 Feb 2014 12:51:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCv0Y-0001Fh-5z for bug-gnu-emacs@gnu.org; Mon, 10 Feb 2014 12:51:07 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCv0Y-0001Fc-2I for bug-gnu-emacs@gnu.org; Mon, 10 Feb 2014 12:51:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WCv0X-000503-Rh for bug-gnu-emacs@gnu.org; Mon, 10 Feb 2014 12:51:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juanma Barranquero Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Feb 2014 17:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14757 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 14757-submit@debbugs.gnu.org id=B14757.139205464019188 (code B ref 14757); Mon, 10 Feb 2014 17:51:01 +0000 Original-Received: (at 14757) by debbugs.gnu.org; 10 Feb 2014 17:50:40 +0000 Original-Received: from localhost ([127.0.0.1]:41625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WCv08-0004zK-U8 for submit@debbugs.gnu.org; Mon, 10 Feb 2014 12:50:37 -0500 Original-Received: from mail-yh0-f45.google.com ([209.85.213.45]:55891) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WCv04-0004z6-W8 for 14757@debbugs.gnu.org; Mon, 10 Feb 2014 12:50:33 -0500 Original-Received: by mail-yh0-f45.google.com with SMTP id i57so5438151yha.4 for <14757@debbugs.gnu.org>; Mon, 10 Feb 2014 09:50:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=5eJHoTPqCvmlsZO/3Q664nEBV+pakaiIV2RwfU8aVdc=; b=uhLTvMQOEyVdRc6noCNW/OSVjXKxxb1w0C/mjcXKC7joeiBzaqbUiPISJg+hsjwZ/7 b2nvlc1gYH37atL6cpdDTvgWOFYDS3QC/D6t9BYFNZ8RSOwntxbZnxGdVBD4zaG6n2lA 50toBHYR6JzqJCL92KBUcGlix6HWSHAgRmxjeO50+xxgGuKc+/1aKx/JU8GzmzJ00sSo YSfCDIbU2KTi8/jXWhbotEZPd6wFfPht9Ss+N5tfXQNu0W7+Zoy5sfMewKKuPVdNYDRO fNCbabxfsCSqgCMq62d7uIOoKr0d7mAFbrLej+CWhSFTGpWnwA1ZK5MLE9kO7HEVJtqJ lx8w== X-Received: by 10.236.144.103 with SMTP id m67mr1446025yhj.146.1392054627032; Mon, 10 Feb 2014 09:50:27 -0800 (PST) Original-Received: by 10.170.84.65 with HTTP; Mon, 10 Feb 2014 09:49:45 -0800 (PST) In-Reply-To: <83iospx45n.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:85290 Archived-At: 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