[Genabel-commits] r781 - in pkg/ProbABEL: . src

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2011-09-02 11:31:59 +0200 (Fri, 02 Sep 2011)
New Revision: 781

Modified:
   pkg/ProbABEL/configure.ac
   pkg/ProbABEL/src/Makefile.am
   pkg/ProbABEL/src/probabel.pl
Log:
After installation of probabel.pl adjust the location of the .cfg file to the actual install location.

Modified: pkg/ProbABEL/configure.ac
===================================================================
--- pkg/ProbABEL/configure.ac	2011-09-01 09:30:25 UTC (rev 780)
+++ pkg/ProbABEL/configure.ac	2011-09-02 09:31:59 UTC (rev 781)
@@ -32,6 +32,9 @@
 AC_CHECK_FUNCS([pow putenv sqrt strdup strncasecmp])
 
 
+# Check for presence of sed. Needed to replace path to /etc in probabel.pl
+AC_PROG_SED
+
 # Check for presence of pdfLaTeX
 AC_CHECK_PROG(PDFLATEX, pdflatex, pdflatex)
 if test -z "$PDFLATEX"; then

Modified: pkg/ProbABEL/src/Makefile.am
===================================================================
--- pkg/ProbABEL/src/Makefile.am	2011-09-01 09:30:25 UTC (rev 780)
+++ pkg/ProbABEL/src/Makefile.am	2011-09-02 09:31:59 UTC (rev 781)
@@ -47,3 +47,8 @@
 
 ## Install the config file
 dist_sysconf_DATA = probabel_config.cfg
+
+## Insert the correct path to the configure file in probabel.pl
+install-exec-hook:
+	$(SED) -i "s;probabel_config.cfg;@sysconfdir@/probabel_config.cfg;" \
+		 $(DESTDIR)$(bindir)/probabel.pl

Modified: pkg/ProbABEL/src/probabel.pl
===================================================================
--- pkg/ProbABEL/src/probabel.pl	2011-09-01 09:30:25 UTC (rev 780)
+++ pkg/ProbABEL/src/probabel.pl	2011-09-02 09:31:59 UTC (rev 781)
@@ -9,7 +9,7 @@
 #            Version:  1.5
 #            Created:  28-Oct-2008
 #           Revision:  none
-#  last modification:  11-Aug-2011
+#  last modification:  02-Sep-2011
 #
 #             Author:  Lennart C. Karssen,
 #                      Maksim V. Struchalin,
@@ -27,7 +27,7 @@
 
 
 $version="1.5";
-$release_data="11-Aug-2011";
+$release_data="02-Sep-2011";
 
 $_2df_file_postfix = "_2df.out.txt";
 $_add_file_postfix = "_add.out.txt";
@@ -42,7 +42,7 @@
 $separator_filename = "_._chr_._";
 
 $base_path = "./";
-$config = "/etc/probabel_config.cfg";
+$config = "probabel_config.cfg";
 
 @method = ("linear","logistic","coxph");
 @anprog = ($base_path . "palinear", $base_path . "palogist", $base_path . "pacoxph");