chiark / gitweb /
Makefile: clean target Move various rm's from debian/rules
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 24 Feb 2024 23:23:08 +0000 (23:23 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 24 Feb 2024 23:29:08 +0000 (23:29 +0000)
These are applicable to upstream too.

And run very-clean rather than open-coding rm target.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Makefile
debian/rules

index 633034cb0088dce6caa01dff634f19e2f818997c..0f7098daf20ee71510dae59d420f72d75fc78783 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,9 @@ install: all
        $(INSTALL) -m 644 $(MAN8PAGES) $(DESTDIR)$(man8dir)/.
 
 clean:
-       rm -rf stamp/* doc/html
+       rm -rf stamp/*
+       rm -rf docs/html docs/doctrees
+       rm -f hippotat-setup-permissions.8
 
 very-clean: clean
        $(CARGO) clean
index 5b0d77ee28b369ffcb650cbf6e07b9ef43906131..e63965cf41163a288dfd8f69812f6e7831559507 100755 (executable)
@@ -35,10 +35,8 @@ execute_before_dh_auto_clean:
        then mv Cargo.lock.upstream Cargo.lock; fi
 
 execute_after_dh_auto_clean:
-       rm -rf target
-       rm -rf docs/html docs/doctrees
+       $(MAKE) very-clean
        rm -rf debian/cargo_home
-       rm -f hippotat-setup-permissions.8
 
 override_dh_auto_test:
        @echo not running tests during build - they need unshare