Update makefile and run to remove dependence on static folder location

frameworks/C++/cpoll_cppsp/Makefile

@@ -1,13 +1,11 @@
 all: cppsp_0.2
 
 clean:
-	rm -rf cppsp_rel0.2.3 cppsp_0.2
+	rm -rf $IROOT/cppsp_0.2
 	rm -f www/*.so www/*.txt
-cppsp_0.2: cppsp_0.2.3.tar.xz
-	tar xf cppsp_0.2.3.tar.xz
-	ln -s cppsp_rel0.2.3 cppsp_0.2
-	$(MAKE) CXX=g++-4.8 -C cppsp_0.2 all
+	rm -f www/forcedynamic.cppsm.*
+
+cppsp_0.2:
+	$(MAKE) CXX=g++-4.8 -C $(IROOT)/cppsp_0.2 all
 
-cppsp_0.2.3.tar.xz:
-	wget -c http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_0.2.3.tar.xz
 

frameworks/C++/cpoll_cppsp/install.sh

@@ -2,3 +2,7 @@
 
 sudo apt-get install -y postgresql-server-dev-9.3 libpq-dev
 
+fw_get -O cppsp_0.2.3.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_0.2.3.tar.xz
+fw_untar cppsp_0.2.3.tar.xz
+
+mv cppsp_rel0.2.3/ cppsp_0.2.3

frameworks/C++/cpoll_cppsp/setup.py

@@ -7,7 +7,7 @@ def start(args, logfile, errfile):
   setup_util.replace_text("cpoll_cppsp/www/connectioninfo.H", "\\#define BENCHMARK_DB_HOST \".*\"", "#define BENCHMARK_DB_HOST \"" + args.database_host + "\"")
   subprocess.check_call("make clean", shell=True, cwd="cpoll_cppsp", stderr=errfile, stdout=logfile)
   subprocess.check_call("make", shell=True, cwd="cpoll_cppsp", stderr=errfile, stdout=logfile)
-  subprocess.Popen("./run_application \"$(pwd)\"/www -g g++-4.8 -m /forcedynamic.cppsm", shell=True, cwd="cpoll_cppsp", stderr=errfile, stdout=logfile);
+  subprocess.Popen("./run_application $TROOT/www -g g++-4.8 -m /forcedynamic.cppsm", shell=True, cwd=args.iroot + "/cppsp_0.2.3", stderr=errfile, stdout=logfile);
   return 0
 
 def stop(logfile, errfile):