# HG changeset patch
# User crestani
# Date 1131637513 0
# Node ID f4a678ca6f3d446dd0601991d544f659a2bb9de0
# Parent  6f985406c4db9ab19a75e42caa7c9577de443300
[xemacs-hg @ 2005-11-10 15:45:13 by crestani]
Fix build output directory structure.

diff -r 6f985406c4db -r f4a678ca6f3d nt/ChangeLog
--- a/nt/ChangeLog	Wed Nov 09 22:51:10 2005 +0000
+++ b/nt/ChangeLog	Thu Nov 10 15:45:13 2005 +0000
@@ -1,3 +1,9 @@
+2005-11-08  Marcus Crestani  <crestani@xemacs.org>
+
+	* xemacs.mak:
+	* xemacs.mak ($(OUTDIR)):
+	* xemacs.mak (all): Fix build output directory structure.
+
 2005-10-28  Ben Wing  <ben@xemacs.org>
 
 	* xemacs.mak (HAVE_BIGNUM):
diff -r 6f985406c4db -r f4a678ca6f3d nt/xemacs.mak
--- a/nt/xemacs.mak	Wed Nov 09 22:51:10 2005 +0000
+++ b/nt/xemacs.mak	Thu Nov 10 15:45:13 2005 +0000
@@ -97,6 +97,8 @@
 
 ########################### Figure out current version of VC++.
 
+!if [if not exist $(OUTDIR) mkdir "$(OUTDIR)"]
+!endif
 !if [echo MSC_VER=_MSC_VER > $(OUTDIR)\vcversion.c]
 !endif
 !if [cl /nologo /EP $(OUTDIR)\vcversion.c > $(OUTDIR)\vcversion.tmp]
@@ -936,7 +938,7 @@
 # Whether to use dependency information generated by make-src-depend
 #
 !if $(DEPEND) && exist("$(SRC)\depend")
-! if [if not exist $(OUTDIR)\nul mkdir "$(OUTDIR)"]
+! if [if not exist $(OUTDIR) mkdir "$(OUTDIR)"]
 ! endif
 # This perl script used to be inline but that caused too many quoting problems
 ! if [perl $(NT)\make-nt-depend -s=$(SRC) -c=$(NT) -o=$(OUTDIR) < $(SRC)\depend > $(OUTDIR)\depend.tmp]
@@ -953,18 +955,18 @@
 !if $(SEPARATE_BUILD)
 # #### `if not exist' does not like the quotes around file names.
 # But what if one of them has spaces?  Fucking Microsoft!
-! if [if not exist $(BLDROOT)\nul mkdir "$(BLDROOT)"]
+! if [if not exist $(BLDROOT) mkdir "$(BLDROOT)"]
 ! endif
-! if [if not exist $(BLDLIB_SRC)\nul mkdir "$(BLDLIB_SRC)"]
+! if [if not exist $(BLDLIB_SRC) mkdir "$(BLDLIB_SRC)"]
 ! endif
-! if [if not exist $(BLDNT)\nul mkdir "$(BLDNT)"]
+! if [if not exist $(BLDNT) mkdir "$(BLDNT)"]
 ! endif
-! if [if not exist $(OUTDIR)\nul mkdir "$(OUTDIR)"]
+! if [if not exist $(OUTDIR) mkdir "$(OUTDIR)"]
 ! endif
-! if [if not exist $(BLDSRC)\nul mkdir "$(BLDSRC)"]
+! if [if not exist $(BLDSRC) mkdir "$(BLDSRC)"]
 ! endif
 # No point.
-# ! if [if not exist "$(BLDROOT)\nul" mkdir "$(BLDROOT)"]
+# ! if [if not exist "$(BLDROOT)" mkdir "$(BLDROOT)"]
 # ! endif
 !endif
 
@@ -987,7 +989,7 @@
 
 ###################### Generated source files
 
-$(OUTDIR)\nul:
+$(OUTDIR):
 	-@mkdir $(OUTDIR)
 
 XEMACS_INCLUDES=\
@@ -1310,7 +1312,7 @@
 ## and update-elc-2 due to the sideways dependency of NEEDTODUMP.  See
 ## src/Makefile.in.in for a more detailed discussion of this.
 
-all:	installation $(OUTDIR)\nul $(LIB_SRC_TOOLS) \
+all:	installation $(OUTDIR) $(LIB_SRC_TOOLS) \
 	update-elc update-elc-2 \
 	$(LISP)/finder-inf.el load-shadows info