- fix up makefile for VC++: use parens not brackets in variables:

$(VAR) instead of ${VAR}

bochs/Makefile.in

@@ -19,6 +19,11 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+####################################################
+# NOTE: To be compatibile with nmake (microsoft vc++) please follow
+# the following rules:
+#   use $(VAR) not ${VAR}
 
 VERSION=1.1.x
 VER_STRING=cvs-snapshot
@@ -32,7 +37,7 @@ RM=rm
 MV=mv
 LN_S=ln -sf
 DLXLINUX_TAR=dlxlinux1.tar.gz
-DLXLINUX_TAR_URL=http://bochs.sourceforge.net/guestos/${DLXLINUX_TAR}
+DLXLINUX_TAR_URL=http://bochs.sourceforge.net/guestos/$(DLXLINUX_TAR)
 DLXLINUX_ROMFILE=BIOS-bochs-2001_0517
 GUNZIP=gunzip
 WGET=wget
@@ -155,7 +160,7 @@ bochs@EXE@: @IODEV_LIB_VAR@ @DEBUGGER_VAR@ \
 $(BX_OBJS): $(BX_INCLUDES)
 
 bxversion.h::
-	${RM} -f bxversion.h
+	$(RM) -f bxversion.h
 	echo '// This file is generated by "make bxversion.h"' > bxversion.h
 	echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
 	echo "#define REL_STRING \"$(REL_STRING)\"" >> bxversion.h
@@ -218,45 +223,45 @@ libbochs_cpu.a: @DEBUGGER_VAR@ $(BX_OBJS)
 install: install_bin install_dlx
 
 install_bin::
-	${CP} bochs ${BINPATH}/bochs-${VERSION}
+	$(CP) bochs $(BINPATH)/bochs-$(VERSION)
-	${RM} -f ${BINPATH}/bochs
+	$(RM) -f $(BINPATH)/bochs
-	${LN_S} bochs-${VERSION} ${BINPATH}/bochs
+	$(LN_S) bochs-$(VERSION) $(BINPATH)/bochs
-	for i in bochs-dlx bochs-docs; do cp build/linux/$$i ${BINPATH}; done
+	for i in bochs-dlx bochs-docs; do cp build/linux/$$i $(BINPATH); done
-	-mkdir ${PREFIX}
+	-mkdir $(PREFIX)
-	-mkdir ${PREFIX}/${VERSION}
+	-mkdir $(PREFIX)/$(VERSION)
-	test -d ${PREFIX}/${VERSION}
+	test -d $(PREFIX)/$(VERSION)
-	test -w ${PREFIX}/${VERSION}
+	test -w $(PREFIX)/$(VERSION)
-	for i in ${INSTALL_LIST}; do /bin/cp $$i ${PREFIX}/${VERSION}; done
+	for i in $(INSTALL_LIST); do /bin/cp $$i $(PREFIX)/$(VERSION); done
-	${CP} -r docs-html ${PREFIX}/${VERSION}
+	$(CP) -r docs-html $(PREFIX)/$(VERSION)
-	${RM} -f ${PREFIX}/${VERSION}/README
+	$(RM) -f $(PREFIX)/$(VERSION)/README
-	${CAT} build/linux/README.linux-binary README > ${PREFIX}/${VERSION}/README
+	$(CAT) build/linux/README.linux-binary README > $(PREFIX)/$(VERSION)/README
 
 install_dlx::
-	${RM} -f ${DLXLINUX_TAR}
+	$(RM) -f $(DLXLINUX_TAR)
-	${WGET} ${DLXLINUX_TAR_URL}
+	$(WGET) $(DLXLINUX_TAR_URL)
-	${RM} -rf ${PREFIX}/dlxlinux
+	$(RM) -rf $(PREFIX)/dlxlinux
-	${GUNZIP} -c ${DLXLINUX_TAR} | (cd ${PREFIX}; tar -xvf -)
+	$(GUNZIP) -c $(DLXLINUX_TAR) | (cd $(PREFIX); tar -xvf -)
-	test -d ${PREFIX}/dlxlinux
+	test -d $(PREFIX)/dlxlinux
-	(cd ${PREFIX}/dlxlinux; ${MV} .bochsrc .bochsrc.orig; ${SED} -e "s/BIOS-bochs-990925a/${DLXLINUX_ROMFILE}/" -e "s/1\.1\.2/${VERSION}/g"< .bochsrc.orig > bochsrc; rm -f .bochsrc.orig)
+	(cd $(PREFIX)/dlxlinux; $(MV) .bochsrc .bochsrc.orig; $(SED) -e "s/BIOS-bochs-990925a/$(DLXLINUX_ROMFILE)/" -e "s/1\.1\.2/$(VERSION)/g"< .bochsrc.orig > bochsrc; rm -f .bochsrc.orig)
-	${CHOWN} -R root.root ${PREFIX}/dlxlinux
+	$(CHOWN) -R root.root $(PREFIX)/dlxlinux
-	${CHMOD} 777 ${PREFIX}/dlxlinux
+	$(CHMOD) 777 $(PREFIX)/dlxlinux
-	${CHMOD} 666 ${PREFIX}/dlxlinux/*
+	$(CHMOD) 666 $(PREFIX)/dlxlinux/*
-	${CHMOD} 644 ${PREFIX}/dlxlinux/README
+	$(CHMOD) 644 $(PREFIX)/dlxlinux/README
 
 erase_install::
-	${RM} -rf ${PREFIX}/${VERSION}
+	$(RM) -rf $(PREFIX)/$(VERSION)
-	${RM} -rf ${PREFIX}/dlxlinux
+	$(RM) -rf $(PREFIX)/dlxlinux
 
 rpm:: dist-clean
-	test -w ${SOURCES}
+	test -w $(SOURCES)
-	test -w ${SPECS}
+	test -w $(SPECS)
 	rm -f /usr/src/redhat/SPECS/bochs.spec
-	${CAT} build/linux/bochs.rpmspec.template | ${SED} "s/@VERSION@/${VERSION}/g" > ${SPECS}/bochs.spec
+	$(CAT) build/linux/bochs.rpmspec.template | $(SED) "s/@VERSION@/$(VERSION)/g" > $(SPECS)/bochs.spec
-	${RM} -rf ${SOURCES}/bochs
+	$(RM) -rf $(SOURCES)/bochs
-	${MKDIR} ${SOURCES}/bochs
+	$(MKDIR) $(SOURCES)/bochs
-	${TAR} cf - * .??* | (cd ${SOURCES}/bochs && tar xf -)
+	$(TAR) cf - * .??* | (cd $(SOURCES)/bochs && tar xf -)
-	(cd ${SOURCES}; tar czf bochs.tar.gz bochs)
+	(cd $(SOURCES); tar czf bochs.tar.gz bochs)
-	${RPM} -ba ${SPECS}/bochs.spec
+	$(RPM) -ba $(SPECS)/bochs.spec
 
 clean:
 	@RMCOMMAND@ *.o