From 6c768b3a57f69d75a75d6564eda5a5d64b8f7def Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 21 Jul 2017 10:49:35 -0700
Subject: [PATCH] Install .coms after .scms; avoid warning of newer source
 files.

---
 src/compiler/Makefile-fragment    | 4 ++--
 src/cref/Makefile-fragment        | 4 ++--
 src/ffi/Makefile-fragment         | 4 ++--
 src/runtime/Makefile-fragment     | 2 +-
 src/sf/Makefile-fragment          | 4 ++--
 src/sos/Makefile-fragment         | 4 ++--
 src/ssp/Makefile-fragment         | 4 ++--
 src/star-parser/Makefile-fragment | 4 ++--
 src/xdoc/Makefile-fragment        | 4 ++--
 src/xml/Makefile-fragment         | 4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/compiler/Makefile-fragment b/src/compiler/Makefile-fragment
index 65c3b8e37..d11fa3aa5 100644
--- a/src/compiler/Makefile-fragment
+++ b/src/compiler/Makefile-fragment
@@ -13,9 +13,9 @@ install:
 	$(INSTALL_DATA) $(srcdir)/*.pkg *.pkd $(DESTDIR)$(DIR)/.
 	set -e ; \
 	for D in back base fggen fgopt rtlbase rtlgen rtlopt ; do \
+	    ( cd $(srcdir)/$$D ; \
+	      $(INSTALL_DATA) *.scm $(DESTDIR)$(DIR)/$$D/. ) ; \
 	    ( cd $$D ; \
 	      $(INSTALL_COM) *.com $(DESTDIR)$(DIR)/$$D/. ; \
 	      $(INSTALL_DATA) *.bci $(DESTDIR)$(DIR)/$$D/. ) ; \
-	    ( cd $(srcdir)/$$D ; \
-	      $(INSTALL_DATA) *.scm $(DESTDIR)$(DIR)/$$D/. ) ; \
 	done
diff --git a/src/cref/Makefile-fragment b/src/cref/Makefile-fragment
index 546d5da47..3c6d6389a 100644
--- a/src/cref/Makefile-fragment
+++ b/src/cref/Makefile-fragment
@@ -6,6 +6,6 @@ TARGET_DIR = $(AUXDIR)/cref
 install:
 	rm -rf $(DESTDIR)$(TARGET_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
 	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
diff --git a/src/ffi/Makefile-fragment b/src/ffi/Makefile-fragment
index d705eec69..39ecf9171 100644
--- a/src/ffi/Makefile-fragment
+++ b/src/ffi/Makefile-fragment
@@ -6,6 +6,6 @@ TARGET_DIR = $(AUXDIR)/ffi
 install:
 	rm -rf $(DESTDIR)$(TARGET_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
 	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
diff --git a/src/runtime/Makefile-fragment b/src/runtime/Makefile-fragment
index a1b50a6d2..ded44ee3a 100644
--- a/src/runtime/Makefile-fragment
+++ b/src/runtime/Makefile-fragment
@@ -6,6 +6,6 @@ RUNDIR = $(AUXDIR)/runtime
 install:
 	rm -rf $(DESTDIR)$(RUNDIR)
 	$(mkinstalldirs) $(DESTDIR)$(RUNDIR)
+	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(RUNDIR)/.
 	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(RUNDIR)/.
 	$(INSTALL_COM) *.com $(DESTDIR)$(RUNDIR)/.
-	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(RUNDIR)/.
diff --git a/src/sf/Makefile-fragment b/src/sf/Makefile-fragment
index 9b7bf53c1..b742743c0 100644
--- a/src/sf/Makefile-fragment
+++ b/src/sf/Makefile-fragment
@@ -6,6 +6,6 @@ TARGET_DIR = $(AUXDIR)/sf
 install:
 	rm -rf $(DESTDIR)$(TARGET_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
 	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
diff --git a/src/sos/Makefile-fragment b/src/sos/Makefile-fragment
index b82228408..525ecdeef 100644
--- a/src/sos/Makefile-fragment
+++ b/src/sos/Makefile-fragment
@@ -6,6 +6,6 @@ TARGET_DIR = $(AUXDIR)/sos
 install:
 	rm -rf $(DESTDIR)$(TARGET_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
 	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
diff --git a/src/ssp/Makefile-fragment b/src/ssp/Makefile-fragment
index 7068024de..d2de1455c 100644
--- a/src/ssp/Makefile-fragment
+++ b/src/ssp/Makefile-fragment
@@ -6,6 +6,6 @@ SSP_DIR = $(AUXDIR)/ssp
 install:
 	rm -rf $(DESTDIR)$(SSP_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(SSP_DIR)
-	$(INSTALL_COM) *.com $(DESTDIR)$(SSP_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(SSP_DIR)/.
 	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(SSP_DIR)/.
+	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(SSP_DIR)/.
+	$(INSTALL_COM) *.com $(DESTDIR)$(SSP_DIR)/.
diff --git a/src/star-parser/Makefile-fragment b/src/star-parser/Makefile-fragment
index 413f88f0e..4fd9ba7c2 100644
--- a/src/star-parser/Makefile-fragment
+++ b/src/star-parser/Makefile-fragment
@@ -6,6 +6,6 @@ PARSER_DIR = $(AUXDIR)/star-parser
 install:
 	rm -rf $(DESTDIR)$(PARSER_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(PARSER_DIR)
-	$(INSTALL_COM) *.com $(DESTDIR)$(PARSER_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(PARSER_DIR)/.
 	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(PARSER_DIR)/.
+	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(PARSER_DIR)/.
+	$(INSTALL_COM) *.com $(DESTDIR)$(PARSER_DIR)/.
diff --git a/src/xdoc/Makefile-fragment b/src/xdoc/Makefile-fragment
index 2cc98ba2e..b93a688a4 100644
--- a/src/xdoc/Makefile-fragment
+++ b/src/xdoc/Makefile-fragment
@@ -6,6 +6,6 @@ XDOC_DIR = $(AUXDIR)/xdoc
 install:
 	rm -rf $(DESTDIR)$(XDOC_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(XDOC_DIR)
-	$(INSTALL_COM) *.com $(DESTDIR)$(XDOC_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(XDOC_DIR)/.
 	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(XDOC_DIR)/.
+	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(XDOC_DIR)/.
+	$(INSTALL_COM) *.com $(DESTDIR)$(XDOC_DIR)/.
diff --git a/src/xml/Makefile-fragment b/src/xml/Makefile-fragment
index c24655889..bb0eed9f9 100644
--- a/src/xml/Makefile-fragment
+++ b/src/xml/Makefile-fragment
@@ -6,6 +6,6 @@ TARGET_DIR = $(AUXDIR)/xml
 install:
 	rm -rf $(DESTDIR)$(TARGET_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
-	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
 	cd $(srcdir) && $(INSTALL_DATA) *.pkg *.scm $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_DATA) *.pkd *.bci $(DESTDIR)$(TARGET_DIR)/.
+	$(INSTALL_COM) *.com $(DESTDIR)$(TARGET_DIR)/.
-- 
2.25.1