Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2010-05-21 16:51:50 -07:00
parent ea46a84e60 13310e4b2d
commit 4740e8adc9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -303,8 +303,8 @@ top_srcdir = @top_srcdir@
SUBDIRS = $(USER_DIR) $(KERNEL_DIR) SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
AUTOMAKE_OPTIONS = foreign dist-zip AUTOMAKE_OPTIONS = foreign dist-zip
EXTRA_DIST = autogen.sh config/config.awk zfs.spec.in \ EXTRA_DIST = autogen.sh config/config.awk zfs.spec.in \
zfs-modules.spec.in META DISCLAIMER GIT OPENSOLARIS.LICENSE \ zfs-modules.spec.in META DISCLAIMER COPYRIGHT GIT \
ZFS.RELEASE OPENSOLARIS.LICENSE ZFS.RELEASE
noinst_HEADERS = zfs_config.h noinst_HEADERS = zfs_config.h
all: zfs_config.h all: zfs_config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive $(MAKE) $(AM_MAKEFLAGS) all-recursive