diff options
| -rw-r--r-- | COPYRIGHT | 6 | ||||
| -rw-r--r-- | config/zfs-build.m4 | 6 | ||||
| -rw-r--r-- | lib/libzpool/include/Makefile.am | 2 | ||||
| -rw-r--r-- | zfs.spec.in | 3 |
4 files changed, 7 insertions, 10 deletions
diff --git a/COPYRIGHT b/COPYRIGHT deleted file mode 100644 index 2ca159945..000000000 --- a/COPYRIGHT +++ /dev/null @@ -1,6 +0,0 @@ -The bulk of the library is Copyright 2004 Sun Microsystems, Inc. -Portions are Copyright 2006 OmniTI, Inc. - -The library is distributed under the terms of the CDDL. -See the file OPENSOLARIS.LICENSE for more information. - diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index e9b24edb6..11e45c500 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -66,11 +66,13 @@ AC_DEFUN([ZFS_AC_KERNEL], [ AC_MSG_RESULT([$kernsrcver]) kmoduledir=${INSTALL_MOD_PATH}/lib/modules/$kernsrcver - LINUX=${kernelsrc} - LINUX_OBJ=${kernelbuild} + LINUX=${kernelsrc} + LINUX_OBJ=${kernelbuild} + LINUX_VERSION=${kernsrcver} AC_SUBST(LINUX) AC_SUBST(LINUX_OBJ) + AC_SUBST(LINUX_VERSION) AC_SUBST(kmoduledir) ]) diff --git a/lib/libzpool/include/Makefile.am b/lib/libzpool/include/Makefile.am index 71f0eaa8e..d386e052a 100644 --- a/lib/libzpool/include/Makefile.am +++ b/lib/libzpool/include/Makefile.am @@ -1 +1 @@ -noinst_HEADERS = sys/*.h +pkginclude_HEADERS = sys/*.h diff --git a/zfs.spec.in b/zfs.spec.in index db486693f..3895123e5 100644 --- a/zfs.spec.in +++ b/zfs.spec.in @@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER GIT +%doc AUTHORS ChangeLog COPYING DISCLAIMER GIT %doc OPENSOLARIS.LICENSE README TODO ZFS.RELEASE %{_sbindir}/* %{_libdir}/* @@ -94,6 +94,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) %{kdir}/include/zfs/* +%{_includedir}/* %post if [ -f /boot/System.map-%{kver} ]; then |