Merge branch 'development' into weinberg_angle

ChangeLog

@@ -1,4 +1,9 @@
-FlexibleSUSY-1.4.1 [not released yet]
+FlexibleSUSY-1.4.2 [May, 09 2016]
+
+ * Bugfix: Correcting handling of spaces in configure script if
+   /bin/sh is /bin/dash.
+
+FlexibleSUSY-1.4.1 [May, 09 2016]
 
  * Feature: Tab-completion for FlexibleSUSY's spectrum generators and
    scripts in the bash.
@@ -9,6 +14,9 @@ FlexibleSUSY-1.4.1 [not released yet]
  * Feature: For each model an example SLHA input file is generated,
    which is located at models/<model>/LesHouches.in.<model>_generated
 
+ * Feature (commit 2b95522): Allow user to provide specific location
+   to libpthread using the --with-pthread-libdir= option.
+
  * Change: The algorithm to determine the running fermion masses and
    gauge couplings has been replaced by a more secure one.  The new
    algorithm performs an iteration between 2 GeV and MZ to fix all
@@ -19,7 +27,7 @@ FlexibleSUSY-1.4.1 [not released yet]
  * Bugfix (commit 59b867d): Avoid singularity in the limit MSU^2 /
    M3^2 -> MSQ^2 / M3^2 in HSSUSY.
 
- * Bugfix (commit f3864b8): Catch exception from SoftSUSY's QedQcd
+ * Bugfix (commit f3864b8): Catch exception from SOFTSUSY's QedQcd
    class which are triggered when the input value of Mt_pole is chosen
    to be smaller than MZ_pole.
 
@@ -33,6 +41,13 @@ FlexibleSUSY-1.4.1 [not released yet]
  * Bugfix (commits bcb99bc - 8b5d87e): Fixing compilation error for
    models which don't have input parameters.
 
+ * Bugfix (commits 637d099, 8b3a94f, 2e3a972): Fixing `make
+   install-src' in case the path to the FlexibleSUSY contains spaces.
+
+ * Bugfix (commits ced2072, 8bc8fdd): Adding support for further
+   debian-based multi-architecture linux distributions in the
+   configure script.
+
 FlexibleSUSY-1.4.0 [March, 08 2016]
 
  * Feature: Allow the user to chose the loop order of the RGEs to be
@@ -310,7 +325,7 @@ FlexibleSUSY-1.3.0 [January, 08 2016]
 
  * Bugfix (commit 1b4fc20): Correcting W contribution in beta-function
    of alpha_em in the SM with 5 active quark flavours.
-   Imported from SoftSUSY (commit 0139daa).
+   Imported from SOFTSUSY (commit 0139daa).
 
  * Bugfix (commit d7dbeb6): Adding neutrino charge, Qv, to list of
    input parameters in the UMSSM.  This fixes a compilation error with
@@ -481,7 +496,7 @@ FlexibleSUSY-1.1.0 [May, 31 2015]
 
  * Feature: Calculation of DR-bar weak mixing angle from Fermi
    constant and Z pole mass.  The implementation is based on
-   expressions from SoftSUSY and works for the SM, MSSM, NMSSM and
+   expressions from SOFTSUSY and works for the SM, MSSM, NMSSM and
    their variants.  The method for the calculation of the weak mixing
    angle can be selected via the FSWeakMixingAngleInput variable in
    the FlexibleSUSY model file.

config/Makefile.in

@@ -98,7 +98,7 @@ ADDONLIBS:=
 FSCONFIG := @FSCONFIG@
 
 # configure script
-CONFIGURE_SCRIPT := $(ABSBASEDIR)/configure
+CONFIGURE_SCRIPT := configure
 
 # dependency generator
 DEPGEN = $(DEPGEN_EXE)
@@ -107,16 +107,14 @@ DEPGEN = $(DEPGEN_EXE)
 SARAH_DEP_GEN := @SARAH_DEP_GEN@
 
 # script which installs a file without export markers
-INSTALL_STRIPPED := \
-		$(ABSBASEDIR)/config/install_stripped.sh
+INSTALL_STRIPPED := config/install_stripped.sh
 
 # script which replaces path\like\this with path/like/this
 # thereby enabling FlexibleSUSY to run on Cygwin
-CONVERT_DOS_PATHS := \
-		$(ABSBASEDIR)/config/convert_dos_paths.sh
+CONVERT_DOS_PATHS := config/convert_dos_paths.sh
 
 # README file
-README_FILE := $(ABSBASEDIR)/README
+README_FILE := README
 
 .PHONY:  all allsrc allexec alllib alltest clean-executables \
 	 clean clean-dep clean-obj depend distclean showbuild tag \

config/install_stripped.sh

@@ -25,12 +25,12 @@ fi
 stripped_source="${source}.stripped"
 
 # strip source file
-${BASEDIR}/remove_export_markers.sh ${source} > ${stripped_source}
+${BASEDIR}/remove_export_markers.sh "${source}" > "${stripped_source}"
 
 if test -d "${dest}"; then
     dest="${dest}/`basename ${source}`"
 fi
 
-install ${args} ${stripped_source} ${dest}
+install ${args} "${stripped_source}" "${dest}"
 
-rm -f ${stripped_source}
+rm -f "${stripped_source}"