X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=support%2Fscripts%2Fbuild.mak;h=d4f0477015f680a854d459abfc40b6bbaee80db7;hb=156f898b7ee419e0956fc06f191625033a27b0c4;hp=3b2ae2b324497f9deb159efc8caa9f5f8b02af78;hpb=25c5f9b70be439731c3ad8c8b1ffdb4892e758db;p=fw%2Fsdcc

diff --git a/support/scripts/build.mak b/support/scripts/build.mak
index 3b2ae2b3..d4f04770 100644
--- a/support/scripts/build.mak
+++ b/support/scripts/build.mak
@@ -10,6 +10,8 @@ BUILD = $(TOPDIR)/build/sdcc
 SDCCLIB = $(BUILD)
 CVSFLAGS = -z5
 CVS = cvs
+SVNFLAGS =
+SVN = svn
 DIR = .
 VER = 2.2.1
 # Used as a branch name.
@@ -24,7 +26,7 @@ COMPILE_MODE = linux-mingw32
 SDCC_OR_GBDK = sdcc
 
 ROOT_GBDK = :pserver:anonymous@cvs.gbdk.sourceforge.net:/cvsroot/gbdk
-ROOT_SDCC = :pserver:anonymous@cvs.sdcc.sourceforge.net:/cvsroot/sdcc
+ROOT_SDCC = https://sdcc.svn.sourceforge.net/svnroot/sdcc
 
 ifeq ($(COMPILE_MODE),linux-linux)
 # For Linux
@@ -62,15 +64,16 @@ clean:
 	rm -rf $(BUILD) gbdk-lib gbdk-support sdcc logged_in
 
 update: logged_in
-	cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_SDCC) co -r sdcc-$(SHORTVER) sdcc
+	cd $(DIR); svn $(SVNFLAGS) co $(ROOT_SDCC)/branches/sdcc-$(SHORTVER)/sdcc sdcc
 	cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r sdcc-$(SHORTVER) gbdk-lib
 	cd $(DIR); cvs $(CVSFLAGS) -d$(ROOT_GBDK) co -r sdcc-$(SHORTVER) gbdk-support
 
 _sdcc: sdcc-bin sdcc-misc sdcc-lib sdcc-doc
 
 tidy:
-	rm -rf `find $(BUILD) -name "CVS"`
-	rm -rf `find $(BUILD)/lib -name "*.asm"`
+	find $(BUILD) -name "CVS" -exec rm -rf \;
+	find $(BUILD) -name ".svn" -exec rm -rf \;
+	find $(BUILD)/lib -name "*.asm" -exec rm -rf \;
 	-$(TNP)strip $(BUILD)/bin/*
 
 sdcc-bin: sdcc/sdccconf.h
@@ -123,10 +126,10 @@ ifdef TNP
 	export CCC=$(TNP)c++; \
 	export RANLIB=$(TNP)ranlib; \
 	export CC=$(TNP)gcc; \
-	./configure --datadir=$(SDCC_ROOT)
+	./configure --datarootdir=$(SDCC_ROOT)
 	echo $$CCC
 else
-	cd sdcc; ./configure --datadir=$(SDCC_ROOT)
+	cd sdcc; ./configure --datarootdir=$(SDCC_ROOT)
 endif
 
 dist: _sdcc lcc tidy