bug#10261: 24.0.92; The "dist" makefile target & the "--distfiles" configure option

[Christoph Scholtes]

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)