Skip to content

Commit

Permalink
Kernel header installation should respect --prefix
Browse files Browse the repository at this point in the history 
This is the upstream component of work that enables preliminary support
for building Gentoo's ZFS packaging on other Linux systems via Gentoo
Prefix.

Signed-off-by: Richard Yao <[email protected]>
  • Loading branch information
@ryao
ryao committed Aug 29, 2014
1 parent 61e99a7 commit 4df5a79
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ endif
if CONFIG_KERNEL
SUBDIRS += module

extradir = /usr/src/zfs-$(VERSION)
extradir = @prefix@/src/zfs-$(VERSION)

This comment has been minimized.

Sign in to view

Copy link
@behlendorf

behlendorf Aug 29, 2014

My only major concern is that this effectively changes the default install location for anything running ./configure; make; make install. Arguably this is more correct, but it's still a change which may be disruptive.

This comment has been minimized.

Sign in to view

Copy link
@ryao

ryao Sep 2, 2014

Author Owner

@behlendorf The lustre developers might need to check this location for the sources so that ./configure; make; make install continues to work.
extra_HEADERS = zfs.release.in zfs_config.h.in

kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION)
kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
endif

Expand Down
2 changes: 1 addition & 1 deletion include/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif

if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include
kerneldir = @prefix@/src/zfs-$(VERSION)/include
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
2 changes: 1 addition & 1 deletion include/linux/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif

if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include/linux
kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
2 changes: 1 addition & 1 deletion include/sys/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif

if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include/sys
kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
2 changes: 1 addition & 1 deletion include/sys/fm/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif

if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm
kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
2 changes: 1 addition & 1 deletion include/sys/fm/fs/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif

if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fm/fs
kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
2 changes: 1 addition & 1 deletion include/sys/fs/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif

if CONFIG_KERNEL
kerneldir = /usr/src/zfs-$(VERSION)/include/sys/fs
kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif

0 comments on commit 4df5a79

Please sign in to comment.