fixes #92 - 'make bootstrap' error and add 'make bootstrap' to github…

… action
melsman · Jan 2, 2022 · 3997a7d · 3997a7d
1 parent 0ab99ee
commit 3997a7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -106,6 +106,10 @@ jobs:
         run: |
           make mlkit_bin_dist
 
+      - name: Test bootstrapping
+        run: |
+          make bootstrap
+
       - name: Upload release
         if: ${{ matrix.mlcomp == 'mlton' && github.event_name == 'push' && contains(github.ref, '/tags/v') }}
         uses: svenstaro/upload-release-action@v2

diff --git a/Makefile.in b/Makefile.in
@@ -144,15 +144,17 @@ clean_mlb:
 install_kitdemo:
 	$(MKDIR) $(DATADIR)/kitdemo
 	$(MKDIR) $(DATADIR)/kitdemo/utils
-	$(INSTALLDATA) kitdemo/*.{sml,sig,mlb,c} $(DATADIR)/kitdemo
+	$(INSTALLDATA) kitdemo/Makefile kitdemo/*.{sml,sig,mlb,c} $(DATADIR)/kitdemo
 	$(INSTALLDATA) kitdemo/utils/*.{sml,mlb} $(DATADIR)/kitdemo/utils
 
 .PHONY: install_basis
 install_basis:
 	$(MKDIR) $(LIBDIR)/basis
 	$(MKDIR) $(LIBDIR)/basis/io
-	$(INSTALLDATA) -p basis/*.{sml,sig,mlb,log} $(LIBDIR)/basis
-	$(INSTALLDATA) -p basis/io/*.{sml,sig,log} $(LIBDIR)/basis/io
+	$(INSTALLDATA) -p basis/*.{sml,sig,mlb} $(LIBDIR)/basis
+	$(INSTALLDATA) -p basis/io/*.{sml,sig} $(LIBDIR)/basis/io
+	test -n "`ls -1 basis/* | grep '.log'`" && $(INSTALLDATA) -p basis/*.log $(LIBDIR)/basis
+	test -n "`ls -1 basis/io/* | grep '.log'`" && $(INSTALLDATA) -p basis/io/*.log $(LIBDIR)/basis/io
 
 .PHONY: install_man
 install_man: