Revision 990 trunk/src/GNUmakefile

GNUmakefile (revision 990)
20 20
PWD=$(shell cd)
21 21
endif
22 22

  
23

  
24 23
ifeq ($(CXX),CC)
25 24
CXXFLAGS:=-D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE $(CXXFLAGS)
26 25
else
......
88 87
	if not exist ${DISK}\contrib\lib md ${DISK}\contrib\lib
89 88
	if not exist ${DISK}\contrib\bin md ${DISK}\contrib\bin
90 89
	if not exist ${DISK}\contrib\include md ${DISK}\contrib\include
91
	$(MAKE) ADMB_HOME="$(CURDIR)\${DISK}" --directory=..\contrib
90
	$(MAKE) ADMB_HOME="$(PWD)\${DISK}" --directory=..\contrib
92 91
endif
93 92

  
94 93
libs: admbsaf admbopt
......
232 231
	md ${DISK}\bin
233 232
	copy df1b2-separable\seddf1b* ${DISK}\bin
234 233
	copy df1b2-separable\sedf1b2* ${DISK}\bin
235
	del ${DISK}\bin\admb-cfg.sh
234
	if exist ${DISK}\bin\admb-cfg.sh del ${DISK}\bin\admb-cfg.sh
236 235
	echo "CXX=$(CXX)" > ${DISK}\bin\admb-cfg.sh
237 236
	$(MAKE) --directory=df1b2-separable CC=$(CC) DISKDIR=..\${DISK} bins
238 237
	$(MAKE) --directory=nh99 CC=$(CC) DISKDIR=..\${DISK} bins
......
247 246
	copy ..\scripts\admb\root-admb.bat ..\admb.bat
248 247
endif
249 248

  
250

  
251 249
verify:
252 250
ifndef USE_ADMB_HOME
253 251
  ifneq ($(SHELL),sh.exe)

Also available in: Unified diff