From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 22 Feb 2025 05:13:01 +0000 (-0500)
Subject: Fix dependencies in scrub's Makefile
X-Git-Tag: v1.47.3-rc1~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc3fd9d6996e579de3b920b609b298b80cb73a40;p=thirdparty%2Fe2fsprogs.git

Fix dependencies in scrub's Makefile

Fix the dependences so things work correctly if the user runs "make
install" without running "make all" first.
---

diff --git a/scrub/Makefile.in b/scrub/Makefile.in
index c97a1dd5..6cd5ea54 100644
--- a/scrub/Makefile.in
+++ b/scrub/Makefile.in
@@ -107,7 +107,7 @@ installdirs: $(INSTALLDIRS_TGT)
 	$(Q) $(MKDIR_P) $(DESTDIR)$(root_sbindir) \
 		$(DESTDIR)$(man8dir) $(DESTDIR)$(root_sysconfdir)
 
-install-udev: installdirs-udev
+install-udev: $(UDEV_RULES) $(UDISKS_RULES) installdirs-udev
 	$(Q) for i in $(UDEV_RULES); do \
 		$(ES) "	INSTALL $(UDEV_RULES_DIR)/$$i"; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR)/96-$$i; \
@@ -117,7 +117,7 @@ install-udev: installdirs-udev
 		$(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR)/64-$$i; \
 	done
 
-install-crond: installdirs-crond
+install-crond: $(CRONTABS) installdirs-crond
 	$(Q) if test -n "$(CRONTABS)" ; then \
 		$(ES) "	INSTALL $(CROND_DIR)/e2scrub_all" ; \
 		$(INSTALL_DATA) e2scrub_all.cron $(DESTDIR)$(CROND_DIR)/e2scrub_all ; \
@@ -137,7 +137,7 @@ install-systemd: $(SERVICE_FILES) installdirs-systemd
 
 install-strip: install
 
-install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs $(INSTALL_TGT)
+install: $(PROGS) $(MANPAGES) $(CONFFILES) $(MANPAGES) installdirs $(INSTALL_TGT)
 	$(Q) for i in $(PROGS); do \
 		$(ES) "	INSTALL $(root_sbindir)/$$i"; \
 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \