[Genabel-commits] r1883 - in pkg/ProbABEL: doc src

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

Author: lckarssen
Date: 2014-11-07 13:25:55 +0100 (Fri, 07 Nov 2014)
New Revision: 1883

Modified:
   pkg/ProbABEL/doc/ChangeLog
   pkg/ProbABEL/src/Makefile.am
Log:
Fix ProbABEL bug #5982: "ProbABEL's make install fails on MacOS X and FreeBSD with sed error".

It turns out that the versions of sed used by these operating systems need an explicit '-e' option added when running 'sed', because the '-i' option requires a backup filename extension to be mentioned.
I haven't tested this on MaxOS, but I have tested it on FreeBSD. Since OS X descends from BSD I hope it's fixed there as well.


Modified: pkg/ProbABEL/doc/ChangeLog
===================================================================
--- pkg/ProbABEL/doc/ChangeLog	2014-11-07 11:31:28 UTC (rev 1882)
+++ pkg/ProbABEL/doc/ChangeLog	2014-11-07 12:25:55 UTC (rev 1883)
@@ -14,6 +14,8 @@
 * Fixed bug #5883: The main effect is displayed in the output with the
   `interaction_only` option. Thanks to Maksim Struchalin for fixing it and
   to Farid Radmanesh for reporting it.
+* Fixed bug #5982: ProbABEL's make install fails on MacOS X and FreeBSD
+  with sed error. Thanks to forum user mmold for reporting the bug.
 
 
 ***** v.0.4.3 (2014.04.01)

Modified: pkg/ProbABEL/src/Makefile.am
===================================================================
--- pkg/ProbABEL/src/Makefile.am	2014-11-07 11:31:28 UTC (rev 1882)
+++ pkg/ProbABEL/src/Makefile.am	2014-11-07 12:25:55 UTC (rev 1883)
@@ -90,10 +90,10 @@
 ## Insert the correct values of several variables in the installed
 ## probabel script
 install-exec-hook:
-	$(SED) -i "s;probabel_config.cfg;@sysconfdir@/probabel_config.cfg;" \
+	$(SED) -i -e "s;probabel_config.cfg;@sysconfdir@/probabel_config.cfg;" \
 		$(DESTDIR)$(bindir)/probabel
-	$(SED) -i "s;\./;@bindir@/;" $(DESTDIR)$(bindir)/probabel
-	$(SED) -i "s;PROBABEL_VERSION;@VERSION@;" $(DESTDIR)$(bindir)/probabel
+	$(SED) -i -e "s;\./;@bindir@/;" $(DESTDIR)$(bindir)/probabel
+	$(SED) -i -e "s;PROBABEL_VERSION;@VERSION@;" $(DESTDIR)$(bindir)/probabel
 	ln -s $(DESTDIR)$(bindir)/probabel $(DESTDIR)$(bindir)/probabel.pl
 
 ## Make the script executable