# HG changeset patch # User bgruening # Date 1395085543 14400 # Node ID f35b0eeda699d16fde732279e4d8a8c3a10ffded # Parent 8fb6f74d7db61812f8f775913a7fe10388e53a0e Uploaded diff -r 8fb6f74d7db6 -r f35b0eeda699 tool_dependencies.xml --- a/tool_dependencies.xml Sun Mar 16 16:27:11 2014 -0400 +++ b/tool_dependencies.xml Mon Mar 17 15:45:43 2014 -0400 @@ -10,7 +10,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -60,9 +60,11 @@ tar xfz TPP_4.7.0-src.tgz ./TPP-4.7.0/trans_proteomic_pipeline/src/ + ../build/ echo 'TPP_ROOT=$INSTALL_DIR/tpp/' > Makefile.config.incl echo 'TPP_WEB=/tpp/' >> Makefile.config.incl echo 'CGI_USER_DIR=$INSTALL_DIR/cgi-bin/' >> Makefile.config.incl + echo 'OBJ_ARCH=../build' >> Makefile.config.incl echo "BOOST_DIR=$BOOST_ROOT_DIR" >> Makefile.config.incl @@ -70,6 +72,8 @@ echo 'BOOST_LIB_EXT=so' >> Makefile.config.incl echo 'BOOST_INCL=-isystem $(BOOST_DIR) -isystem $(BOOST_DIR)/.. -I$(SRC_ROOT).' >> Makefile.config.incl echo 'BOOST_LIBS=$(BOOST_LIBDIR)*' >> Makefile.config.incl + echo 'HTMLDOC_BIN=' >> Makefile.config.incl + echo 'LINK=shared' >> Makefile.config.incl echo 'LIBEXT=so' >> Makefile.config.incl @@ -78,7 +82,9 @@ echo "EXPAT_LIB=$EXPAT_ROOT_DIR/lib/libexpat.a" >> Makefile.config.incl echo "EXPAT_INCL=$EXPAT_ROOT_DIR/include/" >> Makefile.config.incl - sed -i -e 's/# Proteowizrd/endif/' Makefile.incl + cat Makefile.config.incl > /home/bag/blablabla.txt + + @@ -88,6 +94,13 @@ sed -i -e 's/# Build expat library/ifeq "$(strip $(EXPAT_LIB))" ""/' Makefile.incl sed -i -e 's/# Build HDF5/endif\n# Build HDF5/' Makefile.incl + sed -i -e 's/# HTMLDOC/ifeq "$(strip $(HTMLDOC_BIN))" "not-needed"/' Makefile.incl + sed -i -e 's/# put common.*/endif/' Makefile.incl + + cat Makefile.incl > /home/bag/makefile.incl.txt + + +