a7ba9d3f20
- Use upstream spec file - Update to pcp-3.6.3. OBS-URL: https://build.opensuse.org/request/show/125083 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=14
86 lines
2.8 KiB
Diff
86 lines
2.8 KiB
Diff
From 70b76abe42aca1c968feb3bfe20b74c61cf05db6 Mon Sep 17 00:00:00 2001
|
|
From: David Disseldorp <ddiss@suse.de>
|
|
Date: Mon, 21 Nov 2011 18:40:36 +0100
|
|
Subject: [PATCH] build: fix configure path tests
|
|
|
|
This commit fixes pcp_(share|binadm|var|lib|man)_dir configure tests:
|
|
if test -z "`echo $pcp_share_dir | sed 's;/.*\$;;'`"
|
|
|
|
Currently all tests evaluate to true when absolute paths are supplied,
|
|
as sed replaces from the leading '/', rather than the end which appears
|
|
to be the intended purpose.
|
|
---
|
|
configure.in | 14 +++++++-------
|
|
1 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index 46e3f27..6b83469 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -1539,7 +1539,7 @@ AC_SUBST(pcp_etc_dir)
|
|
dnl shared PCP files (shareable for diskless)
|
|
pcp_share_dir=`eval echo $datadir`
|
|
pcp_share_dir=`eval echo $pcp_share_dir`
|
|
-if test -z "`echo $pcp_share_dir | sed 's;/.*\$;;'`"
|
|
+if test -z "`echo $pcp_share_dir | sed 's;/\s*\$;;'`"
|
|
then
|
|
if test $target_os = mingw
|
|
then
|
|
@@ -1559,7 +1559,7 @@ AC_SUBST(pcp_share_dir)
|
|
dnl private PCP executables
|
|
pcp_binadm_dir=`eval echo $libexecdir`
|
|
pcp_binadm_dir=`eval echo $pcp_binadm_dir`
|
|
-if test -z "`echo $pcp_binadm_dir | sed 's;/.*\$;;'`"
|
|
+if test -z "`echo $pcp_binadm_dir | sed 's;/\s*\$;;'`"
|
|
then
|
|
if test $target_distro = debian
|
|
then
|
|
@@ -1581,7 +1581,7 @@ AC_SUBST(pcp_binadm_dir)
|
|
dnl non-shared (i.e. system local) PCP files
|
|
pcp_var_dir=`eval echo $localstatedir`
|
|
pcp_var_dir=`eval echo $pcp_var_dir`
|
|
-if test -z "`echo $pcp_var_dir | sed 's;/.*\$;;'`"
|
|
+if test -z "`echo $pcp_var_dir | sed 's;/\s*\$;;'`"
|
|
then
|
|
if test $target_os = mingw
|
|
then
|
|
@@ -1654,7 +1654,7 @@ then
|
|
else
|
|
pcp_lib_dir=`eval echo $libdir`
|
|
pcp_lib_dir=`eval echo $pcp_lib_dir`
|
|
- if test -z "`echo $pcp_lib_dir | sed 's;/.*\$;;'`"
|
|
+ if test -z "`echo $pcp_lib_dir | sed 's;/\s*\$;;'`"
|
|
then
|
|
if test -d /usr/lib
|
|
then
|
|
@@ -1716,7 +1716,7 @@ need_old_tbl_header=false
|
|
man_header=
|
|
pcp_man_dir=`eval echo $mandir`
|
|
pcp_man_dir=`eval echo $pcp_man_dir`
|
|
-if test -z "`echo $pcp_man_dir | sed 's;/.*\$;;'`"
|
|
+if test -z "`echo $pcp_man_dir | sed 's;/\s*\$;;'`"
|
|
then
|
|
dnl some low risk defaults
|
|
if test $target_os = mingw
|
|
@@ -1827,7 +1827,7 @@ AC_SUBST(need_old_tbl_header)
|
|
dnl public binaries
|
|
pcp_bin_dir=`eval echo $bindir`
|
|
pcp_bin_dir=`eval echo $pcp_bin_dir`
|
|
-if test -z "`echo $pcp_bin_dir | sed 's;/.*\$;;'`"
|
|
+if test -z "`echo $pcp_bin_dir | sed 's;/\s*\$;;'`"
|
|
then
|
|
if test $target_os = mingw
|
|
then
|
|
@@ -1844,7 +1844,7 @@ AC_SUBST(pcp_bin_dir)
|
|
dnl include files
|
|
pcp_inc_dir=`eval echo $includedir`
|
|
pcp_inc_dir=`eval echo $pcp_inc_dir`
|
|
-if test -z "`echo $pcp_inc_dir | sed 's;/.*\$;;'`"
|
|
+if test -z "`echo $pcp_inc_dir | sed 's;/\s*\$;;'`"
|
|
then
|
|
if test $target_os = mingw
|
|
then
|
|
--
|
|
1.7.1
|
|
|