From a2eda2ff48e6c38788d48b121f36ff7d280d569b Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 17 Jan 2012 16:14:35 -0800 Subject: [PATCH] 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 --- Makefile.am | 6 +++--- Makefile.in | 6 +++--- include/Makefile.am | 8 ++++---- include/Makefile.in | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 11fa8ec18e2..209925969db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,9 +30,9 @@ distclean-local:: if CONFIG_KERNEL install-data-local: - destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ - instdest=$(DESTDIR)/usr/src/$$destname; \ - echo "$(SPL_META_VERSION)" >$$instdest/spl.release; \ + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ + instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ + echo "$$release" >$$instdest/spl.release; \ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ done diff --git a/Makefile.in b/Makefile.in index 23f20662f55..90c10c0748c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1022,9 +1022,9 @@ distclean-local:: -type f -print | xargs $(RM) @CONFIG_KERNEL_TRUE@install-data-local: -@CONFIG_KERNEL_TRUE@ destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ -@CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/$$destname; \ -@CONFIG_KERNEL_TRUE@ echo "$(SPL_META_VERSION)" >$$instdest/spl.release; \ +@CONFIG_KERNEL_TRUE@ release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +@CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ +@CONFIG_KERNEL_TRUE@ echo "$$release" >$$instdest/spl.release; \ @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ @CONFIG_KERNEL_TRUE@ done diff --git a/include/Makefile.am b/include/Makefile.am index d1289f0a051..31acf7e9988 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,14 +15,14 @@ noinst_HEADERS += $(top_srcdir)/include/util/*.h noinst_HEADERS += $(top_srcdir)/include/vm/*.h install-data-local: - destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ - instdest=$(DESTDIR)/usr/src/$$destname; \ + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ + instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ instfiles=`find . -name '*.h'`; \ for instfile in $$instfiles; do \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ done uninstall-local: - destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ - instdest=$(DESTDIR)/usr/src/$$destname; \ + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ + instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ $(RM) -R $$instdest diff --git a/include/Makefile.in b/include/Makefile.in index 832ffb38d42..37fce0449a3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -464,16 +464,16 @@ uninstall-am: uninstall-local install-data-local: - destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ - instdest=$(DESTDIR)/usr/src/$$destname; \ + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ + instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ instfiles=`find . -name '*.h'`; \ for instfile in $$instfiles; do \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ done uninstall-local: - destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ - instdest=$(DESTDIR)/usr/src/$$destname; \ + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ + instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ $(RM) -R $$instdest # Tell versions [3.59,3.63) of GNU make to not export all variables.