diff options
Diffstat (limited to 'sysutils/e2fsprogs/files/patch-misc__Makefile.in')
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-misc__Makefile.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sysutils/e2fsprogs/files/patch-misc__Makefile.in b/sysutils/e2fsprogs/files/patch-misc__Makefile.in index 312ce6244f10..6bbb60679e18 100644 --- a/sysutils/e2fsprogs/files/patch-misc__Makefile.in +++ b/sysutils/e2fsprogs/files/patch-misc__Makefile.in @@ -1,5 +1,5 @@ ---- ./misc/Makefile.in.orig 2012-03-27 06:36:20.000000000 +0200 -+++ ./misc/Makefile.in 2012-04-01 17:17:10.000000000 +0200 +--- ./misc/Makefile.in.orig 2012-07-17 07:21:04.000000000 +0200 ++++ ./misc/Makefile.in 2012-08-02 19:59:09.000000000 +0200 @@ -28,15 +28,15 @@ SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ @@ -40,7 +40,7 @@ profile.o: $(E) " CC $<" @@ -482,34 +482,9 @@ - echo " INSTALL_DATA $(man5dir)/$$i"; \ + $(ES) " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done - $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \ @@ -49,13 +49,13 @@ - true; \ - else \ - if grep -q ext4dev $(DESTDIR)$(root_sysconfdir)/mke2fs.conf ; then \ -- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ +- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ - $(INSTALL_DATA) mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new; \ - echo "Warning: installing mke2fs.conf in $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ - echo "Check to see if you need to update your $(root_sysconfdir)/mke2fs.conf"; \ - else \ -- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ +- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ - mv $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old; \ - $(INSTALL_DATA) mke2fs.conf \ @@ -67,11 +67,11 @@ - echo " "; \ - fi; \ - else \ -- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ +- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ - $(INSTALL_DATA) mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \ - fi -+ $(Q) echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ ++ $(Q) $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ + $(INSTALL_DATA) mke2fs.conf.dist \ + $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist |