Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -315,41 +315,39 @@
 # install dashboard as dboard so wrapper script can be called dashboard
 $(PREFIX)/bin/.$(ARCHSTR)/dboard : dboard $(FILES) utils/mk_wrapper
 	utils/mk_wrapper $(PREFIX) dboard $(PREFIX)/bin/dashboard
 	chmod a+x $(PREFIX)/bin/dashboard
 	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
+
+# Work around missing libraries on crappy corporate compute farm (hearafter known as CCCF)
+ifeq ($(ARCHSTR),12.5)
+EXTRALIBS_HACK=$(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0
+else
+EXTRALIBS_HACK=
+endif
 
 $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so : lib/libpangox-1.0.so
-	if [[ $(ARCHSTR) == 12.5 ]]; then \
-	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib; \
-	$(INSTALL) lib/libpangox-1.0.so $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so; \
-	fi
+	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib
+	$(INSTALL) lib/libpangox-1.0.so $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so
 
 $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 : lib/libpangox-1.0.so.0
-	if [[ $(ARCHSTR) == 12.5 ]]; then \
-	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib; \
-	$(INSTALL) lib/libpangox-1.0.so.0 $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0; \
-        fi
+	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib
+	$(INSTALL) lib/libpangox-1.0.so.0 $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0
 
 $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0 : lib/libxcb-xlib.so.0
-	if [[ $(ARCHSTR) == 12.5 ]]; then \
-	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib; \
-	$(INSTALL) lib/libxcb-xlib.so.0 $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0; \
-        fi
+	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib
+	$(INSTALL) lib/libxcb-xlib.so.0 $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0
 
 install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
           $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
           $(PREFIX)/bin/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \
 	  $(PREFIX)/bin/nbfind $(PREFIX)/bin/mtrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \
 	  $(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \
           $(PREFIX)/share/js/jquery-3.1.0.slim.min.js \
-          $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so \
-          $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 \
-          $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0
-#         $(PREFIX)/bin/.$(ARCHSTR)/ndboard
+	  $(EXTRALIBS_HACK)
 
 # $(PREFIX)/bin/newdashboard
 
 $(PREFIX)/bin/.$(ARCHSTR) : 
 	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)