From f4f9cd75a1e4654bf50cac6dbb5496ba93bb1662 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 26 Jun 2009 16:30:44 -0700 Subject: [PATCH] Install spl-devel products in /usr/src/spl-SPL_VERSION/LINUX_VERSION/ Remove the spl symlink, it's just confusing --- Makefile.am | 4 ++-- Makefile.in | 4 ++-- include/Makefile.am | 3 ++- include/Makefile.in | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index b7aed778e5..0224303611 100644 --- 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 732880fcc1..c87fbb7cfa 100644 --- 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 d1990dcb0a..3388ce8d95 100644 --- 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 53650a52e7..db1587d47e 100644 --- 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; \