Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-ztest' into linux-ztest

This commit is contained in:
Brian Behlendorf 2009-12-11 16:53:54 -08:00
parent 34aa2ace68 0cf0b27968
commit c98963d056
6 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/config/rpm.am include $(top_srcdir)/config/rpm.am
if CONFIG_USER if CONFIG_USER
USER_DIR = config doc scripts lib cmd USER_DIR = config man scripts lib cmd
endif endif
if CONFIG_KERNEL if CONFIG_KERNEL
KERNEL_DIR = module KERNEL_DIR = module

3
configure.ac
View File

@ -52,7 +52,8 @@ ZFS_AC_DEBUG
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
config/Makefile config/Makefile
doc/Makefile man/Makefile
man/man8/Makefile
lib/Makefile lib/Makefile
lib/libavl/Makefile lib/libavl/Makefile
lib/libefi/Makefile lib/libefi/Makefile

1
doc/Makefile.am
View File

@ -1 +0,0 @@
EXTRA_DIST = LEGAL

1
man/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = man8

5
man/man8/Makefile.am Normal file
View File

@ -0,0 +1,5 @@
man_MANS = zdb.8 zfs.8 zpool.8
EXTRA_DIST = $(man_MANS)
install-data-local:
$(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8"

1
zfs.spec.in
View File

@ -63,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
%doc OPENSOLARIS.LICENSE README TODO ZFS.RELEASE %doc OPENSOLARIS.LICENSE README TODO ZFS.RELEASE
%{_sbindir}/* %{_sbindir}/*
%{_libdir}/* %{_libdir}/*
%{_mandir}/man8/*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)