diff --git a/src/Makefile.am b/src/Makefile.am
index f003e697..9a502098 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -556,7 +556,7 @@ VERSION
 # php/00README.txt php/recoll/config.m4 php/recoll/make.sh 
 # php/recoll/php_recoll.h php/recoll/recoll.cpp php/sample/shell.php 
 
-OPTSFORPYTHON != test -f /etc/debian_version && echo --install-layout=deb
+OPTSFORPYTHON = $(shell test -f /etc/debian_version && echo --install-layout=deb)
 
 if MAKEPYTHON
 all-local:: recollpython
@@ -600,7 +600,7 @@ rclpychm-install:
         )
 rclpychm-clean:
 	rm -rf python/pychm/build
-	rm -r python/pychm/dist/*
+	rm -rf python/pychm/dist/*
 endif
 
 if MAKEQT
diff --git a/src/query/plaintorich.cpp b/src/query/plaintorich.cpp
index f612f033..60fdcb8d 100644
--- a/src/query/plaintorich.cpp
+++ b/src/query/plaintorich.cpp
@@ -155,10 +155,11 @@ bool TextSplitPTR::matchGroups()
 // for validating, or catching things which are probably urls but miss
 // a scheme (e.g. www.xxx.com/index.html), because complicated.
 static const string urlRE = "(https?://[[:alnum:]~_/.%?&=,#@]+)[[:space:]|]";
+static const string urlRep{"<a href=\"$1\">$1</a>"};
 static std::regex url_re(urlRE);
 static string activate_urls(const string& in)
 {
-    return std::regex_replace(in, url_re, "<a href=\"$1\">$1</a>");
+    return std::regex_replace(in, url_re, urlRep);
 }
 
 // Fix result text for display inside the gui text window.
diff --git a/src/rcldb/rclabsfromtext.cpp b/src/rcldb/rclabsfromtext.cpp
index b84282b5..e7640df9 100644
--- a/src/rcldb/rclabsfromtext.cpp
+++ b/src/rcldb/rclabsfromtext.cpp
@@ -54,9 +54,10 @@ static const string cstr_nc("\n\r\x0c\\");
 static const string punctcls("[-<>._+,#*=|]");
 static const string punctRE = "(" + punctcls +  " *)(" + punctcls + " *)+";
 static std::regex fixfrag_re(punctRE);
+static const string punctRep{"$2"};
 static string fixfrag(const string& infrag)
 {
-    return std::regex_replace(neutchars(infrag, cstr_nc), fixfrag_re, "$2");
+    return std::regex_replace(neutchars(infrag, cstr_nc), fixfrag_re, punctRep);
 }