MAINTENANCE
diff --git a/src/Makefile.am b/src/Makefile.am
index 848f37f..6f03b35 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,16 +19,19 @@
 mod_netconf.so: mod_netconf.c notification-server.c
 	$(APXS) $(LIBS) $(CFLAGS) -c -o $@ $(srcdir)/mod_netconf.c $(srcdir)/notification-server.c
 
-test-client$(EXEEXT): test-client.c
-	gcc -std=gnu99 -Wall -g -ljson -I/usr/include/json -o $@ $<
+#test-client$(EXEEXT): test-client.c
+#	gcc -std=gnu99 -Wall -g -ljson -I/usr/include/json -o $@ $<
 
 #notification-test$(EXEEXT): notification-server.c
 #	gcc -std=gnu99 -Wall -g -lwebsockets -DTEST_NOTIFICATION_SERVER -o $@ $<
 
 install-exec-local: mod_netconf.so
-	[ "x$(httpdmoduledir)" == x ] && \
-	$(APXS) -i -a mod_netconf.la || \
-	{ mkdir -p "$(httpdmoduledir)"; $(APXS) -i -S LIBEXECDIR="$(httpdmoduledir)" -a mod_netconf.la; }
+	if [ "x${httpdmoduledir}" == x ]; then \
+	$(APXS) -i -a mod_netconf.la; else \
+	{ \
+	  mkdir -p "${httpdmoduledir}"; \
+	  $(APXS) -i -S LIBEXECDIR="${httpdmoduledir}" -a mod_netconf.la; } \
+	fi
 
 webgui-backend$(EXEEXT): mod_netconf.c notification-server.c mod_netconf.h
 	gcc -Wall -g $(LIBS) $(CFLAGS) -DHTTPD_INDEPENDENT  `apr-1-config  --cflags --cppflags --includes --link-ld` -I/usr/include/httpd  -laprutil-1 -o $@ $(srcdir)/mod_netconf.c $(srcdir)/notification-server.c