redo for the millionth time

2 files changed, 6 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index fb179e9..9b265b0 100644
--- a/Makefile
+++ b/Makefile
@@ -64,23 +64,16 @@ commit:
 merge:
 	forge merge --all
 
-deb-with-commits:
-	forge commit --all
-	forge merge devel
-	rm -f ~/incoming/*.deb
-	forge commit --all
-	forge normal
+debs:
 	wit build deb
 
-deb-with-commits-all:
+debs-all:
 	make commit
-	make merge
+	forge merge devel
 	rm -f ~/incoming/*.deb
-	forge commit --all
-	forge normal
-	wit build deb --all --force
+	wit build deb --all
 
-deb-with-commits-all-riscv64:
+debs-with-commits-all-riscv64:
 	make commit
 	make merge
 	rm -f ~/incoming/*.deb
diff --git a/doBuild.go b/doBuild.go
index c12b2b6..6a21a9a 100644
--- a/doBuild.go
+++ b/doBuild.go
@@ -99,7 +99,7 @@ func doBuild() (string, error) {
 			cmd := makeGoDebCmd(repo, newcount, "")
 			cmdstr := fmt.Sprintf("%v", cmd)
 			build := "no"
-			if (smartver != curver) || repo.CheckDirty() {
+			if (smartver != curver) || repo.CheckDirty() || argv.All {
 				build = "yes"
 				repo.DirtyList = cmd
 				tobuild.Clone(repo)