[Jcl-checkins] jcl/install makefile.mak,1.12,1.13

[Olivier S. <ob...@us...>]

Update of /cvsroot/jcl/jcl/install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1125/jcl/install

Modified Files:
	makefile.mak 
Log Message:
The installation program can now compile correctly if only BCB5 is installed.

Index: makefile.mak
===================================================================
RCS file: /cvsroot/jcl/jcl/install/makefile.mak,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** makefile.mak	10 Jun 2004 02:45:53 -0000	1.12
--- makefile.mak	22 Sep 2004 20:56:25 -0000	1.13
***************
*** 20,24 ****
  #---------------------------------------------------------------------------------------------------
  MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
! DCC = $(ROOT)\bin\dcc32.exe -dJCLINSTALL -e$(BIN) -i$(SRC) -q -r$(RES) -u$(UNIT) -w $<
  BRCC = $(ROOT)\bin\brcc32.exe $**
  jpp = ..\source\prototypes\jpp.exe
--- 20,24 ----
  #---------------------------------------------------------------------------------------------------
  MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
! DCC = $(ROOT)\bin\dcc32.exe -dJCLINSTALL -e$(BIN) -i$(SRC) -q -r$(RES) -u$(UNIT) $(DCC32EXTRA) -w $<
  BRCC = $(ROOT)\bin\brcc32.exe $**
  jpp = ..\source\prototypes\jpp.exe
***************
*** 62,68 ****
  
  prepare:	BCB5
  
  BCB5:
! 	if exist "$(ROOT)\Lib\Obj\vcl50.dcp" $(MAKEDIR)\make.exe -fBCB5-dcc32.cfg.mak
  
  VclUnits:
--- 62,71 ----
  
  prepare:	BCB5
+ 	if exist "$(ROOT)\Lib\vcl.dcp" SET DCC32EXTRA="-LUvcl -LUrtl"
+ 	@echo $(DCC32EXTRA)
  
  BCB5:
! 	if exist "$(ROOT)\Lib\Obj\vcl50.dcp" SET DCC32EXTRA="-LUvcl50"
! 	#$(MAKEDIR)\make.exe -fBCB5-dcc32.cfg.mak
  
  VclUnits: