X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2FMakefile.am;h=f834235e3f4d746bb1bd13ce4646edfedb1468ff;hb=2250e072c37855d611aa64027945981fe2c8f4d7;hp=6df5770d6d10c0820ad6e44273ec5b17e0808b9d;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git

diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 6df5770..f834235 100644
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -15,11 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # version 2 along with this program; If not, see
-# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# http://www.gnu.org/licenses/gpl-2.0.html
 #
 # GPL HEADER END
 #
@@ -28,7 +24,7 @@
 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
-# Copyright (c) 2013, 2014, Intel Corporation.
+# Copyright (c) 2013, 2015, Intel Corporation.
 #
 
 #
@@ -37,15 +33,25 @@
 #
 
 # These are scripts that are generated from .in files
-genscripts = lc_modprobe lc_net lc_hb lc_cluman lc_md lc_lvm lustre_start
+genscripts = lc_modprobe lc_net lc_hb lc_cluman lc_md lc_lvm lustre_start lnet
+
+SUBDIRS = systemd
 
-sbin_SCRIPTS = lustre_rmmod
+sbin_SCRIPTS = lustre_rmmod ko2iblnd-probe
 
-if INIT_SCRIPTS
+if RHEL
 initdir = $(sysconfdir)/init.d
-init_SCRIPTS  = lnet
+init_SCRIPTS  =
+
+if !HAVE_SYSTEMD
+init_SCRIPTS += lnet
+endif
+
 if SERVER
 init_SCRIPTS += lustre
+if GSS_KEYRING
+init_SCRIPTS += lsvcgss
+endif
 endif
 endif
 
@@ -60,20 +66,31 @@ bin_SCRIPTS  += lustre_req_history
 hadir = $(sysconfdir)/ha.d/resource.d
 ha_SCRIPTS = Lustre.ha_v2
 
+if ZFS_ENABLED
+zedletdir = $(sysconfdir)/zfs/zed.d/
+zedlet_SCRIPTS = statechange-lustre.sh
+endif
+
 scriptlibdir = @libexecdir@/@PACKAGE@
 scriptlib_SCRIPTS = haconfig
 scriptlib_DATA = lc_common
 endif # SERVER
+
+if ZFS_ENABLED
+sbin_SCRIPTS += zfsobj2fid
+endif
+
 endif # UTILS
 
-EXTRA_DIST = license-status version_tag.pl version_tag-git.pl \
-	     version_tag-none.pl lustre_rmmod ldev lc_mon lhbadm \
+EXTRA_DIST = license-status lustre_rmmod ldev lc_mon lhbadm \
 	     lc_servip lustre_routes_config lustre_routes_conversion \
 	     $(addsuffix .in,$(genscripts)) lfs_migrate lustre_req_history \
-	     lustre lnet lc_common haconfig Lustre.ha_v2 dkms.mkconf
+	     lustre lsvcgss lc_common haconfig Lustre.ha_v2 dkms.mkconf \
+	     zfsobj2fid ko2iblnd-probe statechange-lustre.sh
 
 CLEANFILES = $(genscripts)
 
 $(genscripts): %: %.in
-	sed -e 's#@scriptlibdir@#$(scriptlibdir)#' < $< > $@
+	sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
+	    -e 's,@scriptlibdir\@,$(scriptlibdir),g' $< > $@
 	chmod +x $@