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

Add the release component to headers 

When the original build system code was added the release
component was accidentally omited from the development header
install path.  This patch adds the missing path component so
it's always clear exactly what release your compiling against.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2012-01-17 16:14:35 -08:00
parent ec2b41049f
commit a2eda2ff48
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -30,9 +30,9 @@ distclean-local::
if CONFIG_KERNEL if CONFIG_KERNEL
install-data-local: install-data-local:
destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
instdest=$(DESTDIR)/usr/src/$$destname; \ instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
echo "$(SPL_META_VERSION)" >$$instdest/spl.release; \ echo "$$release" >$$instdest/spl.release; \
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
done done

6
Makefile.in
View File

@ -1022,9 +1022,9 @@ distclean-local::
-type f -print | xargs $(RM) -type f -print | xargs $(RM)
@CONFIG_KERNEL_TRUE@install-data-local: @CONFIG_KERNEL_TRUE@install-data-local:
@CONFIG_KERNEL_TRUE@ destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ @CONFIG_KERNEL_TRUE@ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
@CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/$$destname; \ @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
@CONFIG_KERNEL_TRUE@ echo "$(SPL_META_VERSION)" >$$instdest/spl.release; \ @CONFIG_KERNEL_TRUE@ echo "$$release" >$$instdest/spl.release; \
@CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
@CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
@CONFIG_KERNEL_TRUE@ done @CONFIG_KERNEL_TRUE@ done

8
include/Makefile.am
View File

@ -15,14 +15,14 @@ noinst_HEADERS += $(top_srcdir)/include/util/*.h
noinst_HEADERS += $(top_srcdir)/include/vm/*.h noinst_HEADERS += $(top_srcdir)/include/vm/*.h
install-data-local: install-data-local:
destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
instdest=$(DESTDIR)/usr/src/$$destname; \ instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
instfiles=`find . -name '*.h'`; \ instfiles=`find . -name '*.h'`; \
for instfile in $$instfiles; do \ for instfile in $$instfiles; do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
done done
uninstall-local: uninstall-local:
destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
instdest=$(DESTDIR)/usr/src/$$destname; \ instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
$(RM) -R $$instdest $(RM) -R $$instdest

8
include/Makefile.in
View File

@ -464,16 +464,16 @@ uninstall-am: uninstall-local
install-data-local: install-data-local:
destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
instdest=$(DESTDIR)/usr/src/$$destname; \ instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
instfiles=`find . -name '*.h'`; \ instfiles=`find . -name '*.h'`; \
for instfile in $$instfiles; do \ for instfile in $$instfiles; do \
$(INSTALL) -D $$instfile $$instdest/$$instfile; \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
done done
uninstall-local: uninstall-local:
destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \
instdest=$(DESTDIR)/usr/src/$$destname; \ instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \
$(RM) -R $$instdest $(RM) -R $$instdest
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.