diff options
| author | Brian Behlendorf <[email protected]> | 2009-06-26 16:30:44 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-06-26 16:30:44 -0700 |
| commit | f4f9cd75a1e4654bf50cac6dbb5496ba93bb1662 (patch) | |
| tree | 39afab86468a1e1f68b412027d0e3dcbd8a5b8b9 | |
| parent | c0517c35d244beea61ff443f1e6e7229ef6337fe (diff) | |
Install spl-devel products in /usr/src/spl-SPL_VERSION/LINUX_VERSION/
Remove the spl symlink, it's just confusing
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | include/Makefile.am | 3 | ||||
| -rw-r--r-- | include/Makefile.in | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index b7aed778e..022430361 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 732880fcc..c87fbb7cf 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 d1990dcb0..3388ce8d9 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 53650a52e..db1587d47 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; \ |