| Message ID | 20180821075159.6415-1-lczerner@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | scrub: use MKDIR_P instead of MKINSTALLDIRS | expand |
On Tue, Aug 21, 2018 at 09:51:59AM +0200, Lukas Czerner wrote: > MKINSTALLDIRS variable is not defined in scrub/Makefile for > creating the directories. Use MKDIR_P instead. > > Signed-off-by: Lukas Czerner <lczerner@redhat.com> > --- > scrub/Makefile.in | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/scrub/Makefile.in b/scrub/Makefile.in > index f58331de..fc8cbcfd 100644 > --- a/scrub/Makefile.in > +++ b/scrub/Makefile.in > @@ -85,24 +85,24 @@ e2scrub_all_cron: e2scrub_all_cron.in > $(Q) $(SUBSTITUTE_UPTIME) $< $@ > > installdirs-udev: > - $(E) " MKINSTALLDIRS $(UDEV_RULES_DIR)" > - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(UDEV_RULES_DIR) > + $(E) " $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_DIR)" > + $(Q) $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_DIR) Nit: the other Makefile.in's in e2fsprogs have "MKDIR_P" in the $(E) echo line, not "$(MKDIR_P)". - Eric
On Tue, Aug 21, 2018 at 10:25:32AM -0700, Eric Biggers wrote: > On Tue, Aug 21, 2018 at 09:51:59AM +0200, Lukas Czerner wrote: > > MKINSTALLDIRS variable is not defined in scrub/Makefile for > > creating the directories. Use MKDIR_P instead. > > > > Signed-off-by: Lukas Czerner <lczerner@redhat.com> > > --- > > scrub/Makefile.in | 20 ++++++++++---------- > > 1 file changed, 10 insertions(+), 10 deletions(-) > > > > diff --git a/scrub/Makefile.in b/scrub/Makefile.in > > index f58331de..fc8cbcfd 100644 > > --- a/scrub/Makefile.in > > +++ b/scrub/Makefile.in > > @@ -85,24 +85,24 @@ e2scrub_all_cron: e2scrub_all_cron.in > > $(Q) $(SUBSTITUTE_UPTIME) $< $@ > > > > installdirs-udev: > > - $(E) " MKINSTALLDIRS $(UDEV_RULES_DIR)" > > - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(UDEV_RULES_DIR) > > + $(E) " $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_DIR)" > > + $(Q) $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_DIR) > > Nit: the other Makefile.in's in e2fsprogs have "MKDIR_P" in the $(E) echo line, > not "$(MKDIR_P)". > Also this patch adds $(DESTDIR) to the echo line here, but it's not in any of the other ones. - Eric
diff --git a/scrub/Makefile.in b/scrub/Makefile.in index f58331de..fc8cbcfd 100644 --- a/scrub/Makefile.in +++ b/scrub/Makefile.in @@ -85,24 +85,24 @@ e2scrub_all_cron: e2scrub_all_cron.in $(Q) $(SUBSTITUTE_UPTIME) $< $@ installdirs-udev: - $(E) " MKINSTALLDIRS $(UDEV_RULES_DIR)" - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(UDEV_RULES_DIR) + $(E) " $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_DIR)" + $(Q) $(MKDIR_P) $(DESTDIR)$(UDEV_RULES_DIR) installdirs-crond: - $(E) " MKINSTALLDIRS $(CROND_DIR)" - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(CROND_DIR) + $(E) " $(MKDIR_P) $(CROND_DIR)" + $(Q) $(MKDIR_P) $(DESTDIR)$(CROND_DIR) installdirs-libprogs: - $(E) " MKINSTALLDIRS $(pkglibdir)" - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(pkglibdir) + $(E) " $(MKDIR_P) $(pkglibdir)" + $(Q) $(MKDIR_P) $(DESTDIR)$(pkglibdir) installdirs-systemd: - $(E) " MKINSTALLDIRS $(SYSTEMD_SYSTEM_UNIT_DIR)" - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR) + $(E) " $(MKDIR_P) $(SYSTEMD_SYSTEM_UNIT_DIR)" + $(Q) $(MKDIR_P) $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR) installdirs: $(INSTALLDIRS_TGT) - $(E) " MKINSTALLDIRS $(root_sbindir) $(man8dir) $(root_sysconfdir)" - $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ + $(E) " $(MKDIR_P) $(root_sbindir) $(man8dir) $(root_sysconfdir)" + $(Q) $(MKDIR_P) $(DESTDIR)$(root_sbindir) \ $(DESTDIR)$(man8dir) $(DESTDIR)$(root_sysconfdir) install-udev:
MKINSTALLDIRS variable is not defined in scrub/Makefile for creating the directories. Use MKDIR_P instead. Signed-off-by: Lukas Czerner <lczerner@redhat.com> --- scrub/Makefile.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)