diff options
| author | Brian Behlendorf <[email protected]> | 2012-07-12 12:21:25 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-07-12 12:22:51 -0700 |
| commit | fb7eb3e3e9f8e611a34192ceb5c2d2e849ca6de8 (patch) | |
| tree | 9bce645fd2b2a2c2a44203c4e11674b5221cbf6f /Makefile.am | |
| parent | 7535251dcf39cc648ea303ee52e128ad967fad85 (diff) | |
Move zfs.release generation to configure step
Previously, the zfs.release file was created at 'make install' time.
This is slightly problematic when the file is needed without running
'make install'. Because of this, the step creating the file was removed
from 'make install' and replaced with a more appropriate zfs.release.in
file.
As a result, the zfs.release file will now be created earlier as part
of the 'configure' step as opposed to the 'make install' step.
Signed-off-by: Prakash Surya <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 17a6a26e7..1a9171de5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,8 +16,7 @@ EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE - -noinst_HEADERS = zfs_config.h +noinst_HEADERS = zfs_config.h zfs.release distclean-local:: -$(RM) -R autom4te*.cache @@ -35,7 +34,6 @@ if CONFIG_KERNEL install-data-local: release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ - echo "$$release" >$$instdest/zfs.release; \ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ done |