Merge commit 'origin/master' into emacs
commit
303e238374
2
Makefile
2
Makefile
|
@ -148,7 +148,7 @@ winnt-x86-64:
|
||||||
$(MAKE) winnt-finish
|
$(MAKE) winnt-finish
|
||||||
|
|
||||||
winnt-finish:
|
winnt-finish:
|
||||||
cp misc/factor-cygwin.sh factor
|
cp misc/factor-cygwin.sh ./factor
|
||||||
|
|
||||||
wince-arm:
|
wince-arm:
|
||||||
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.ce.arm
|
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.ce.arm
|
||||||
|
|
|
@ -236,7 +236,7 @@ find_word_size() {
|
||||||
|
|
||||||
set_factor_binary() {
|
set_factor_binary() {
|
||||||
case $OS in
|
case $OS in
|
||||||
winnt) FACTOR_BINARY=factor.exe;;
|
winnt) FACTOR_BINARY=factor.com;;
|
||||||
*) FACTOR_BINARY=factor;;
|
*) FACTOR_BINARY=factor;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue