diff options
| author | Brian Behlendorf <behlendorf1@llnl.gov> | 2009-11-24 15:54:47 -0800 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2009-11-24 15:54:47 -0800 |
| commit | 0f0a466680d1f1baa1cfad7d986c8aea5a3178a6 (patch) | |
| tree | 935b0ac3bb3183ce57f722ae4d63ef66ba49fde3 | |
| parent | 645236239afc41ef96ceea9bbe65c9c837659329 (diff) | |
| parent | 05c9e047ccfbfe7b67c7ed5e88eabcce5d55f37c (diff) | |
Merge commit 'refs/top-bases/top' into topzfs-0.4.7
| -rw-r--r-- | scripts/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 293e5ecbe..0d6e2365a 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -227,8 +227,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ pkglibexecdir = $(libexecdir)/@PACKAGE@ nobase_pkglibexec_SCRIPTS = common.sh zconfig.sh zfs.sh \ - zpool-create.sh zpool-config/* zpios.sh zpios-sanity.sh \ - zpios-survey.sh zpios-test/* zpios-profile/* + zpool-create.sh udev-rules/* zpool-config/* zpios.sh \ + zpios-sanity.sh zpios-survey.sh zpios-test/* zpios-profile/* EXTRA_DIST = zfs-update.sh $(nobase_pkglibexec_SCRIPTS) ZFS = ${top_srcdir}/scripts/zfs.sh ZCONFIG = ${top_srcdir}/scripts/zconfig.sh @@ -309,7 +309,7 @@ CTAGS: distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/zpios-profile $(distdir)/zpios-test $(distdir)/zpool-config + $(mkdir_p) $(distdir)/udev-rules $(distdir)/zpios-profile $(distdir)/zpios-test $(distdir)/zpool-config @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ |