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: Mon, 02 Jan 2012 15:08:01 -0700 Message-ID: <4F022AC1.3000009@gmail.com> References: NNTP-Posting-Host: lo.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 1325542137 30132 80.91.229.12 (2 Jan 2012 22:08:57 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 2 Jan 2012 22:08:57 +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 Mon Jan 02 23:08:52 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Rhq3n-0005GN-VP for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Jan 2012 23:08:52 +0100 Original-Received: from localhost ([::1]:59588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rhq3m-0002Ik-Q6 for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Jan 2012 17:08:50 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:46511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rhq3k-0002Ie-KA for bug-gnu-emacs@gnu.org; Mon, 02 Jan 2012 17:08:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rhq3j-0005u7-Di for bug-gnu-emacs@gnu.org; Mon, 02 Jan 2012 17:08:48 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rhq3j-0005tz-AK for bug-gnu-emacs@gnu.org; Mon, 02 Jan 2012 17:08:47 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1Rhq6s-000853-2N for bug-gnu-emacs@gnu.org; Mon, 02 Jan 2012 17:12:02 -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: Mon, 02 Jan 2012 22:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 10261 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 10261-submit@debbugs.gnu.org id=B10261.132554228631013 (code B ref 10261); Mon, 02 Jan 2012 22:12:02 +0000 Original-Received: (at 10261) by debbugs.gnu.org; 2 Jan 2012 22:11:26 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Rhq6H-00084A-8Q for submit@debbugs.gnu.org; Mon, 02 Jan 2012 17:11:25 -0500 Original-Received: from mail-iy0-f172.google.com ([209.85.210.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Rhq6F-000842-20 for 10261@debbugs.gnu.org; Mon, 02 Jan 2012 17:11:23 -0500 Original-Received: by iabz21 with SMTP id z21so7638022iab.3 for <10261@debbugs.gnu.org>; Mon, 02 Jan 2012 14:08:07 -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=679FN8utRKUy6NM7XxsM4tlMLXRZ/8PxwVp/NeiuOAw=; b=hLzNYHaE0ViTNknQG3bZiiv+htAiuPVVs+vfGgIelxJYPMj1fb1BUDzprBMC7WbFwi 2Ez2805jUaFWsbej6XRwmjPXJL0DyNi4nfaCLIo4uoxw7M3PJrFjjg1hM3PCji6TkLXd afOaVhw8eFnAAPpiySRAruWBuIvXWBBzUxovQ= Original-Received: by 10.50.168.70 with SMTP id zu6mr48385689igb.13.1325542087309; Mon, 02 Jan 2012 14:08:07 -0800 (PST) Original-Received: from [192.168.1.4] (174-29-203-215.hlrn.qwest.net. [174.29.203.215]) by mx.google.com with ESMTPS id r5sm71686069igl.3.2012.01.02.14.08.05 (version=SSLv3 cipher=OTHER); Mon, 02 Jan 2012 14:08:06 -0800 (PST) User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Mon, 02 Jan 2012 17:12:02 -0500 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:55374 Archived-At: 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)