mirror of
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
synced 2024-11-24 10:33:35 +08:00
Make sure $prefix/etc is created before installing mke2fs.conf
Fix up $(root_sysconfdir) handling misc/Makefile.in so that make install and make uninstall works correctly when $prefix != /. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
9f0288d3bb
commit
7c8e9ac7f8
@ -234,12 +234,12 @@ filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in
|
||||
@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
|
||||
|
||||
installdirs:
|
||||
@echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
|
||||
@echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
|
||||
@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
|
||||
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
|
||||
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
|
||||
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
|
||||
$(DESTDIR)$(libdir) $(DESTDIR)/etc
|
||||
$(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
|
||||
|
||||
install: all $(SMANPAGES) $(UMANPAGES) installdirs
|
||||
@for i in $(SPROGS); do \
|
||||
@ -347,8 +347,8 @@ uninstall:
|
||||
for i in $(FMANPAGES); do \
|
||||
$(RM) -f $(DESTDIR)$(man5dir)/$$i; \
|
||||
done
|
||||
if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)/etc/mke2fs.conf; then \
|
||||
$(RM) $(DESTDIR)/etc/mke2fs.conf; \
|
||||
if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)/$(root_sysconfdir)/mke2fs.conf; then \
|
||||
$(RM) $(DESTDIR)/$(root_sysconfdir)/mke2fs.conf; \
|
||||
fi
|
||||
|
||||
clean:
|
||||
|
Loading…
Reference in New Issue
Block a user