--- hatari/Makefile	2019/04/01 07:13:23	1.1.1.4
+++ hatari/Makefile	2019/04/09 08:46:55	1.1.1.7
@@ -9,12 +9,14 @@
 
 all: Makefile.cnf config.h
 	$(MAKE) -C src/
+	$(MAKE) -C tools/hmsa/
 
 # Makefile.cnf doesn't exist or is older than Makefile.default.cnf?
 Makefile.cnf: Makefile-default.cnf
 	@echo "Trying to use the default Makefile configuration..."
 	@if [ -f Makefile.cnf ]; then \
-		echo "ERROR: Makefile.cnf exists already and is older (remove if unchanged)"; \
+		echo "ERROR: Makefile.cnf exists already, but is older than the default"; \
+		echo "(just remove it if you haven't changed it)."; \
 		exit 1; \
 	else \
 		cp -v Makefile-default.cnf Makefile.cnf; \
@@ -24,7 +26,8 @@ Makefile.cnf: Makefile-default.cnf
 config.h: config-default.h
 	@echo "Trying to use the default config.h configuration..."
 	@if [ -f config.h ]; then \
-		echo "ERROR: config.h exists already and is older (remove if unchanged)"; \
+		echo "ERROR: config.h exists already and is older than the default"; \
+		echo "(just remove it if you haven't changed it, or re-run configure)."; \
 		exit 1; \
 	else \
 		cp -v config-default.h config.h; \
@@ -36,9 +39,11 @@ hatari.1.gz: doc/hatari.1
 
 clean:
 	$(MAKE) -C src/ clean
+	$(MAKE) -C tools/hmsa/ clean
 
 distclean:
 	$(MAKE) -C src/ distclean
+	$(MAKE) -C tools/hmsa/ distclean
 	$(RM) config.cache config.log Makefile.cnf config.h
 	$(RM) hatari.1.gz
 
@@ -50,7 +55,7 @@ depend:
 install: all hatari.1.gz
 	@if [ "x$(INSTALL)" = "x" ]; then \
 		echo; \
-		echo "*** Hatari was not configured for installation. ***"; \
+		echo "ERROR: Hatari isn't yet configured for installation."; \
 		exit 1; \
 	fi
 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
@@ -59,6 +64,8 @@ install: all hatari.1.gz
 	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
 	$(INSTALL) -d $(DESTDIR)$(DOCDIR)/images
 	$(INSTALL_PROGRAM) src/hatari $(DESTDIR)$(BINDIR)/hatari
+	$(INSTALL_PROGRAM) tools/hmsa/hmsa $(DESTDIR)$(BINDIR)/hmsa
+	$(INSTALL_SCRIPT) tools/zip2st.sh $(DESTDIR)$(BINDIR)/zip2st
 	$(INSTALL_DATA) src/hatari-icon.bmp $(DESTDIR)$(DATADIR)/hatari-icon.bmp
 	if test -f src/tos.img -a \! -f $(DESTDIR)$(DATADIR)/tos.img ; then \
 	  $(INSTALL_DATA) src/tos.img $(DESTDIR)$(DATADIR)/tos.img ; \
@@ -66,3 +73,4 @@ install: all hatari.1.gz
 	$(INSTALL_DATA) hatari.1.gz $(DESTDIR)$(MANDIR)/
 	$(INSTALL_DATA) doc/*.txt doc/*.html $(DESTDIR)$(DOCDIR)/
 	$(INSTALL_DATA) doc/images/*.png $(DESTDIR)$(DOCDIR)/images/
+	$(MAKE) -C python-ui/ install