From 6b83984bdf309e35c8b671e8011db53be885d867 Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Thu, 12 Jul 2018 13:50:26 +0100 Subject: [PATCH] Completed install changes - again --- src/makemake.pl | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/makemake.pl b/src/makemake.pl index f268b90..a7813ba 100755 --- a/src/makemake.pl +++ b/src/makemake.pl @@ -116,23 +116,16 @@ # 12.07.18 No longer uses git submodules sub GetBiopLib { -# if(-d "../.git") -# { -# system("(cd ..; git submodule init)"); -# system("(cd ..; git submodule update)"); -# } -# else -# { - if((! -d "libsrc/bioplib/.git") && (! -d "libsrc/bioplib/src")) - { - system("\\rm -rf libsrc/bioplib"); - system("mkdir -p libsrc"); - my $url = "$::biopgit$::biopversion$::biopext"; - my $tar = "V$::biopversion$::biopext"; - system("(cd libsrc; wget $url; tar xvf $tar; mv bioplib-$::biopversion bioplib)"); - } -# } + if((! -d "libsrc/bioplib/.git") && (! -d "libsrc/bioplib/src")) + { + system("\\rm -rf libsrc/bioplib"); + system("mkdir -p libsrc"); + my $url = "$::biopgit$::biopversion$::biopext"; + my $tar = "V$::biopversion$::biopext"; + system("(cd libsrc; wget $url; tar xvf $tar; mv bioplib-$::biopversion bioplib)"); + } } + #************************************************************************* # Writes the rule for installing code in $BINDIR #