From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christoph Scholtes Newsgroups: gmane.emacs.bugs Subject: bug#10261: 24.0.92; The "dist" makefile target & the "--distfiles" configure option Date: Sat, 04 Feb 2012 15:46:04 -0700 Message-ID: <4F2DB52C.30801@gmail.com> References: <4F022AC1.3000009@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1328395592 29792 80.91.229.3 (4 Feb 2012 22:46:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 4 Feb 2012 22:46:32 +0000 (UTC) Cc: 10261@debbugs.gnu.org To: Dani Moncayo Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Feb 04 23:46:29 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RtoNF-00087i-RR for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Feb 2012 23:46:26 +0100 Original-Received: from localhost ([::1]:53338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtoNF-0007hy-9Z for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Feb 2012 17:46:25 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:59336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtoNC-0007hn-Ez for bug-gnu-emacs@gnu.org; Sat, 04 Feb 2012 17:46:23 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtoNB-00009n-Fo for bug-gnu-emacs@gnu.org; Sat, 04 Feb 2012 17:46:22 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtoNB-00009j-Cw for bug-gnu-emacs@gnu.org; Sat, 04 Feb 2012 17:46:21 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1RtoNp-00060C-Q4 for bug-gnu-emacs@gnu.org; Sat, 04 Feb 2012 17:47:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Christoph Scholtes Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 04 Feb 2012 22:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10261 X-GNU-PR-Package: emacs,w32 X-GNU-PR-Keywords: Original-Received: via spool by 10261-submit@debbugs.gnu.org id=B10261.132839561623061 (code B ref 10261); Sat, 04 Feb 2012 22:47:01 +0000 Original-Received: (at 10261) by debbugs.gnu.org; 4 Feb 2012 22:46:56 +0000 Original-Received: from localhost ([127.0.0.1]:54713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtoNk-0005zu-1Q for submit@debbugs.gnu.org; Sat, 04 Feb 2012 17:46:56 -0500 Original-Received: from mail-iy0-f172.google.com ([209.85.210.172]:46919) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1RtoNg-0005zf-W8 for 10261@debbugs.gnu.org; Sat, 04 Feb 2012 17:46:54 -0500 Original-Received: by iagf6 with SMTP id f6so7073951iag.3 for <10261@debbugs.gnu.org>; Sat, 04 Feb 2012 14:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=rclKst1BTCzXXhNCPyaMDUl5F2ab8xYi5W+J0d6VbVE=; b=UZs8B7YzkbTaf4PVuLXInR+1KvAyJTGi35BxOcGhBlG4TI8HTKRGVbcsi80jBqg2mq qadgdg4/Zai5/SCAI0V4XWHhgVgWsLXuoqh2LSB2eqQN4u684t5o/zLI9qRp9KHostPW g7kPUDVGmVcJTTtdTCA1cU/2mi3MdJSTavs5U= Original-Received: by 10.50.202.97 with SMTP id kh1mr14776978igc.19.1328395566820; Sat, 04 Feb 2012 14:46:06 -0800 (PST) Original-Received: from [192.168.1.2] (71-212-144-226.hlrn.qwest.net. [71.212.144.226]) by mx.google.com with ESMTPS id vr4sm10076307igb.1.2012.02.04.14.46.05 (version=SSLv3 cipher=OTHER); Sat, 04 Feb 2012 14:46:05 -0800 (PST) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:10.0) Gecko/20120129 Thunderbird/10.0 In-Reply-To: <4F022AC1.3000009@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:56501 Archived-At: On 1/2/2012 3:08 PM, Christoph Scholtes wrote: > On 12/10/2011 4:25 AM, Dani Moncayo wrote: > >> The problem is that `$(DIST_FILES)' expands to nothing, because I >> specified no "--distfiles" argument to configure.bat. In fact, if I >> comment out that line, everything seem to go fine. >> >> Therefore, I request to allow making a binary distribution even in >> this case, i.e., that the above-mentioned like of nt/makefile was not >> written by the configure script when there is no --distfiles >> arguments. > > The following patch should fix the problem. It only copies the dist > files if any files were specified in the DIST_FILES variable via > configure.bat. > > Eli, could you please review this to ensure that I am not > over-complicating things. Thanks. > > === modified file 'nt/makefile.w32-in' > --- nt/makefile.w32-in 2011-11-30 16:23:05 +0000 > +++ nt/makefile.w32-in 2012-01-02 22:03:04 +0000 > @@ -257,8 +257,22 @@ > install-shortcuts: > "$(INSTALL_DIR)/bin/addpm" -q > > -dist: install-bin > - mkdir $(TMP_DIST_DIR) > +maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE) > + > +maybe-copy-distfiles-CMD: doit > + @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" $(CP_DIR) > $(DIST_FILES) $(TMP_DIST_DIR)/bin > + > +maybe-copy-distfiles-SH: doit > + @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \ > + $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin > + fi > + > +create-tmp-dist-dir: > + mkdir "$(TMP_DIST_DIR)" > +# Also create bin directory for dist files. > + mkdir "$(TMP_DIST_DIR)/bin" > + > +dist: install-bin create-tmp-dist-dir maybe-copy-distfiles > $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR) > $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR) > $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR) > @@ -269,7 +283,6 @@ > $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR) > $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR) > $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR) > - $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin > $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE) > $(DEL_TREE) $(TMP_DIST_DIR) Any issues with applying this patch? Christoph