From: brian <brian>
Date: Thu, 3 Dec 2009 18:41:43 +0000 (+0000)
Subject: Back out 20315 landing due to breakage with SLES10.
X-Git-Tag: GIT_EPOCH_B_HD_KDMU~22
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=7367b93edf696ea537e00b74c5f9ea26b3fd452d

Back out 20315 landing due to breakage with SLES10.
I suspect that we should be using RPMs %configure macro in our lustre.spec
and we are not.
---

diff --git a/debian/lustre-utils.install b/debian/lustre-utils.install
index aac7ec5..eece3a3 100644
--- a/debian/lustre-utils.install
+++ b/debian/lustre-utils.install
@@ -1,4 +1,4 @@
 debian/tmp/sbin/*			sbin
 debian/tmp/usr/sbin/*			usr/sbin
 debian/tmp/usr/bin/*			usr/bin
-debian/tmp/usr/libexec/lustre/lc_common	usr/libexec/lustre
+debian/tmp/usr/lib/lustre/lc_common	usr/lib/lustre
diff --git a/lustre.spec.in b/lustre.spec.in
index ffbe237..30fdce8 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -148,7 +148,7 @@ cat >lustre.files <<EOF
 
 %attr(-, root, root) %{_mandir}/man?/*
 
-%attr(-, root, root) %{_libexecdir}/lustre/lc_common
+%attr(-, root, root) %{_libdir}/lustre/lc_common
 EOF
 
 if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 1baab1a..4904457 100644
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -47,7 +47,7 @@ EXTRA_DIST = license-status maketags.sh version_tag.pl lc_common \
 	     $(addsuffix .in,$(genscripts)) lc_mon $(sbinscripts) \
 	     $(bin_SCRIPTS) tree_status.pl
 
-scriptlibdir = @libexecdir@/@PACKAGE@
+scriptlibdir = $(libdir)/@PACKAGE@
 scriptlib_DATA = lc_common
 
 CLEANFILES = $(genscripts)