From: Christoph Scholtes <cschol2112@googlemail.com>
To: Dani Moncayo <dmoncayo@gmail.com>
Cc: 10261@debbugs.gnu.org
Subject: bug#10261: 24.0.92; The "dist" makefile target & the "--distfiles" configure option
Date: Mon, 02 Jan 2012 15:08:01 -0700 [thread overview]
Message-ID: <4F022AC1.3000009@gmail.com> (raw)
In-Reply-To: <CAH8Pv0hA1yZ1vhVZLZKOMtswPQt3KOWxjimcYyiMk2PZUMgD_g@mail.gmail.com>
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)
next prev parent reply other threads:[~2012-01-02 22:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-10 11:10 bug#10261: 24.0.92; The "dist" makefile target & the "--distfiles" configure option Dani Moncayo
[not found] ` <CAH8Pv0gPEq9gVF+zs=rf26gu8mFtwW6rHbs25mZHxae4Z2g_NQ@mail.gmail.com>
2011-12-10 11:25 ` Dani Moncayo
2011-12-10 14:32 ` Christoph Scholtes
2011-12-10 15:06 ` Dani Moncayo
2012-01-02 22:08 ` Christoph Scholtes [this message]
2012-02-04 22:46 ` Christoph Scholtes
2012-02-05 16:47 ` Eli Zaretskii
2012-02-05 18:19 ` Christoph Scholtes
2012-02-05 20:22 ` Christoph Scholtes
[not found] ` <CAH8Pv0jsXLTywqE+aT8aH-o_JSP60z84W6_5wmR_KmQNXiBiLg@mail.gmail.com>
[not found] ` <CAH8Pv0hzisvR1TuAL45RS64RAX7CB9W8cFNoS_E6Qt87Bb9ipg@mail.gmail.com>
[not found] ` <837gzpxkga.fsf@gnu.org>
[not found] ` <CAH8Pv0iw2HquHJ5v1r6phLqFqMgW7_kK44AbO9PBC5Zu3U-aLA@mail.gmail.com>
[not found] ` <834nutxgw8.fsf@gnu.org>
[not found] ` <CAH8Pv0iZYdBDEL-1rReRYXb4z6Oi5b4y6tmVaJFBKoDiVk_seA@mail.gmail.com>
[not found] ` <83wr7ovxh5.fsf@gnu.org>
[not found] ` <CAH8Pv0iH0aPf+ON0yL7SMVsNhxv0Ww3j0knpD2_qJo1MgHAPmg@mail.gmail.com>
2012-02-23 7:22 ` Dani Moncayo
2012-02-23 7:52 ` Stefan Monnier
2012-02-23 7:59 ` Dani Moncayo
2012-02-23 8:00 ` Dani Moncayo
2012-02-23 8:37 ` Glenn Morris
2012-02-27 19:43 ` Dani Moncayo
2012-03-23 18:59 ` Dani Moncayo
2012-03-23 19:24 ` Dani Moncayo
2012-04-11 6:33 ` Chong Yidong
2012-04-11 13:11 ` Dani Moncayo
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F022AC1.3000009@gmail.com \
--to=cschol2112@googlemail.com \
--cc=10261@debbugs.gnu.org \
--cc=dmoncayo@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).