[Genabel-commits] r1885 - branches/ProbABEL-v0.4.3-coxfix/ProbABEL/src

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

Author: lckarssen
Date: 2014-11-07 14:46:44 +0100 (Fri, 07 Nov 2014)
New Revision: 1885

Modified:
   branches/ProbABEL-v0.4.3-coxfix/ProbABEL/src/Makefile.am
Log:
Backport the changes to ProbABEL's src/Makefile.am of r1883 and r1884 also to the 0.4.3 coxfix branch.



Modified: branches/ProbABEL-v0.4.3-coxfix/ProbABEL/src/Makefile.am
===================================================================
--- branches/ProbABEL-v0.4.3-coxfix/ProbABEL/src/Makefile.am	2014-11-07 13:39:52 UTC (rev 1884)
+++ branches/ProbABEL-v0.4.3-coxfix/ProbABEL/src/Makefile.am	2014-11-07 13:46:44 UTC (rev 1885)
@@ -52,16 +52,14 @@
 
 
 palinear_SOURCES = $(REGFILES) $(FVSRC) $(FVHEADERS)
-palinear_CXXFLAGS = -DLINEAR $(AM_CXXFLAGS)
-palinear_CPPFLAGS = $(AM_CPPFLAGS)
+palinear_CPPFLAGS = -DLINEAR $(AM_CPPFLAGS)
 if WITH_EIGEN
 palinear_SOURCES += $(EIGENFILES)
 palinear_CXXFLAGS += -DEIGEN
 endif
 
 palogist_SOURCES = $(REGFILES) $(FVSRC) $(FVHEADERS)
-palogist_CXXFLAGS = -DLOGISTIC $(AM_CXXFLAGS)
-palogist_CPPFLAGS = $(AM_CPPFLAGS)
+palogist_CPPFLAGS = -DLOGISTIC $(AM_CPPFLAGS)
 if WITH_EIGEN
 palogist_SOURCES += $(EIGENFILES)
 palogist_CXXFLAGS += -DEIGEN
@@ -69,9 +67,9 @@
 
 pacoxph_SOURCES = $(COXSRC) $(REGFILES) $(FVSRC) $(FVHEADERS)	\
  $(RHEADERS) survS.h survproto.h coxph_data.h coxph_data.cpp
-pacoxph_CXXFLAGS = -DCOXPH -I $(top_srcdir)/src/include $(AM_CXXFLAGS)
-pacoxph_CPPFLAGS = $(AM_CPPFLAGS)
-pacoxph_CFLAGS = -DCOXPH -I $(top_srcdir)/src/include $(AM_CFLAGS)
+pacoxph_CXXFLAGS = -I $(top_srcdir)/src/include $(AM_CXXFLAGS)
+pacoxph_CPPFLAGS = -DCOXPH $(AM_CPPFLAGS)
+pacoxph_CFLAGS = -I $(top_srcdir)/src/include $(AM_CFLAGS)
 if WITH_EIGEN
 pacoxph_SOURCES += $(EIGENFILES)
 pacoxph_CXXFLAGS += -DEIGEN
@@ -92,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