Install spl-devel products in /usr/src/spl-SPL_VERSION/LINUX_VERSION/

Remove the spl symlink, it's just confusing

diff --git a/Makefile.am b/Makefile.am
index b7aed778e56c171e4f9b725fc0640d4e44ffddcf..022430361113cc682bd1f8ac3f94605a469d2a9c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,11 +16,11 @@ distclean-local::
                -type f -print | xargs $(RM)
 
 install-data-local:
-       instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
+       destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
+       instdest=$(DESTDIR)/${prefix}/src/$$destname; \
        for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
                $(INSTALL) -D $$instfile $$instdest/$$instfile; \
        done
-       (cd $(DESTDIR)/${prefix}/src && ln -f -s spl-$(SPL_META_VERSION) spl)
 
 ctags:
        $(RM) $(top_srcdir)/tags

diff --git a/Makefile.in b/Makefile.in
index 732880fcc1ecf5290fe17395aa2751df192f36f0..c87fbb7cfafee101e2bb72e02db5520b50b81675 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -661,11 +661,11 @@ distclean-local::
                -type f -print | xargs $(RM)
 
 install-data-local:
-       instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
+       destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
+       instdest=$(DESTDIR)/${prefix}/src/$$destname; \
        for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
                $(INSTALL) -D $$instfile $$instdest/$$instfile; \
        done
-       (cd $(DESTDIR)/${prefix}/src && ln -f -s spl-$(SPL_META_VERSION) spl)
 
 ctags:
        $(RM) $(top_srcdir)/tags

diff --git a/include/Makefile.am b/include/Makefile.am
index d1990dcb0a0276cc62c59b697d8844fa6ec882b5..3388ce8d950b550f9436f3a48e6ec63bd783e1eb 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -16,7 +16,8 @@ noinst_HEADERS += util/*.h
 noinst_HEADERS += vm/*.h
 
 install-data-local:
-       instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
+       destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
+       instdest=$(DESTDIR)/${prefix}/src/$$destname; \
        instfiles=`find . -name '*.h'`; \
         for instfile in $$instfiles; do \
                $(INSTALL) -D $$instfile $$instdest/$$instfile; \

diff --git a/include/Makefile.in b/include/Makefile.in
index 53650a52e71a8833789e1857a0876f282bf0b796..db1587d47eb9f1bf7aeacafd02101fd3ae6401d7 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -388,7 +388,8 @@ uninstall-am: uninstall-info-am
 
 
 install-data-local:
-       instdest=$(DESTDIR)/${prefix}/src/spl-$(SPL_META_VERSION); \
+       destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \
+       instdest=$(DESTDIR)/${prefix}/src/$$destname; \
        instfiles=`find . -name '*.h'`; \
         for instfile in $$instfiles; do \
                $(INSTALL) -D $$instfile $$instdest/$$instfile; \