User: crestani Date: 05/11/10 16:45:15 Modified: xemacs/nt ChangeLog xemacs.mak Log: Fix build output directory structure. Revision Changes Path 1.193 +6 -0 XEmacs/xemacs/nt/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.192 retrieving revision 1.193 diff -u -p -r1.192 -r1.193 --- ChangeLog 2005/10/28 05:42:07 1.192 +++ ChangeLog 2005/11/10 15:45:13 1.193 ＠＠ -1,3 +1,9 ＠＠ +2005-11-08 Marcus Crestani <crestani(a)xemacs.org&gt; + + * xemacs.mak: + * xemacs.mak ($(OUTDIR)): + * xemacs.mak (all): Fix build output directory structure. + 2005-10-28 Ben Wing <ben(a)xemacs.org&gt; * xemacs.mak (HAVE_BIGNUM): 1.118 +11 -9 XEmacs/xemacs/nt/xemacs.mak Index: xemacs.mak =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v retrieving revision 1.117 retrieving revision 1.118 diff -u -p -r1.117 -r1.118 --- xemacs.mak 2005/10/28 05:42:07 1.117 +++ xemacs.mak 2005/11/10 15:45:13 1.118 ＠＠ -97,6 +97,8 ＠＠ LWLIB_SRCDIR=$(SRCROOT)\lwlib ########################### 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 ＠＠ TEMACS_DOC_SOURCES= \ # 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 ＠＠ TEMACS_DOC_SOURCES= \ !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 ＠＠ $(OUTDIR)\eldap.obj: $(SRCROOT)\modules\ ###################### Generated source files -$(OUTDIR)\nul: +$(OUTDIR): -＠mkdir $(OUTDIR) XEMACS_INCLUDES=\ ＠＠ -1310,7 +1312,7 ＠＠ dump_temacs = $(TEMACS_BATCH) $(dump_tem ## 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