From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 27 Mar 2006 06:10:17 +0000 (-0500)
Subject: Fix minor installation problems in the misc's Makefile
X-Git-Tag: E2FSPROGS-1.39-WIP-0330~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=917cb46946e6843eeee92316633f3a68a4b4d538;p=thirdparty%2Fe2fsprogs.git

Fix minor installation problems in the misc's Makefile

Make sure $(DESTDIR)/usr/share/man/man5 exists when installing the man
page.  Make sure the compressed version 	of the man pages are deleted
when installing the man pages.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 421498da5..328b1c3a7 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-27  Theodore Ts'o  <tytso@mit.edu>
+
+	* Makefile.in: Make sure $(DESTDIR)/usr/share/man/man5 exists when
+		installing the man page.  Make sure the compressed version
+		of the man pages are deleted when installing the man
+		pages.
+
 2006-03-23  Theodore Ts'o  <tytso@mit.edu>
 
 	* mklost+found.c (main): Use a larger counter field so that we can
diff --git a/misc/Makefile.in b/misc/Makefile.in
index f23e49547..b01080f71 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -169,6 +169,7 @@ mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in
 mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in
 	@echo "	SUBST $@"
 	@$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
+
 e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in
 	@echo "	SUBST $@"
 	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
@@ -225,7 +226,9 @@ installdirs:
 	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
 	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
-		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(libdir)
+		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
+		$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
+		$(DESTDIR)$(libdir) $(DESTDIR)/etc
 
 install: all $(SMANPAGES) $(UMANPAGES) installdirs
 	@for i in $(SPROGS); do \
@@ -272,12 +275,16 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
 	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
 		$(DESTDIR)$(man8dir)/mkfs.ext3.8
 	@for i in $(UMANPAGES); do \
-		$(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
+		for j in $(COMPRESS_EXT); do \
+			$(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
+		done; \
 		echo "	INSTALL_DATA $(man1dir)/$$i"; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
 	done
 	@for i in $(FMANPAGES); do \
-		$(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
+		for j in $(COMPRESS_EXT); do \
+			$(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
+		done; \
 		echo "	INSTALL_DATA $(man5dir)/$$i"; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
 	done