On 6/18/14, 10:29 AM, David Sterba wrote:
> On Thu, Jun 12, 2014 at 09:39:14AM -0500, Eric Sandeen wrote:
>>> So what if the mount options are generated from btrfs-mount.txt but
>>> installed under btrfs.5.gz name? If there are more section 5 manpages we
>>> can make it more generic but for now hardcoding btrfs-mount.* ->
>>> btrfs.5. sounds ok to me.
>>
>> Yeah, that seemed like kind of nasty hard-coding, but I suppose it works
>> for now.  I wanted to make it more generic, I didn't have a better idea..
> 
> Added:
> 
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -85,6 +85,9 @@ install-man: man
>         $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
>         $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
>         $(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir)
> +       # the source file name of btrfs.5 clashes with section 8 page, but we
> +       # want to keep the code generic
> +       mv $(DESTDIR)$(man5dir)/btrfs-mount.5.gz 
> $(DESTDIR)$(man5dir)/btrfs.5.gz
>         $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
>         $(LNS) btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
> 
> So the MAN5 code is generic, the exception is only at the installation time.
> 

Looks good to me, thanks.

-Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to