|
 |
ba46c7 |
From 6bf72c587d25132f8b3e9985a7d27f071163e015 Mon Sep 17 00:00:00 2001
|
|
|
ba46c7 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
ba46c7 |
Date: Mon, 30 Sep 2013 12:41:58 -0400
|
|
|
ba46c7 |
Subject: [PATCH 21/28] Ticket 47513 - Set localrundir outside of the "with-fhs" block
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Description: Previously if you built 389 without --with-fhs, localrundir would
|
|
|
ba46c7 |
not be set. Set localrundir above the with-fhs section, and then
|
|
|
ba46c7 |
only reset as needed.
|
|
|
ba46c7 |
|
|
|
ba46c7 |
https://fedorahosted.org/389/ticket/47531
|
|
|
ba46c7 |
|
|
|
ba46c7 |
Reviewed by: rmeggins(Thanks!)
|
|
|
ba46c7 |
(cherry picked from commit a78fa58cce3c3ba67ac3ade40430e55bf431a45e)
|
|
|
ba46c7 |
---
|
|
|
ba46c7 |
configure | 2 ++
|
|
|
ba46c7 |
configure.ac | 2 ++
|
|
|
ba46c7 |
2 files changed, 4 insertions(+), 0 deletions(-)
|
|
|
ba46c7 |
|
|
|
ba46c7 |
diff --git a/configure b/configure
|
|
|
ba46c7 |
index e52aeec..064e319 100755
|
|
|
ba46c7 |
--- a/configure
|
|
|
ba46c7 |
+++ b/configure
|
|
|
ba46c7 |
@@ -17952,6 +17952,8 @@ if test "$with_fhs" = "yes" -a "$with_fhs_opt" = "yes"; then
|
|
|
ba46c7 |
fi
|
|
|
ba46c7 |
|
|
|
ba46c7 |
|
|
|
ba46c7 |
+localrundir='/run'
|
|
|
ba46c7 |
+
|
|
|
ba46c7 |
# installation paths - by default, we store everything
|
|
|
ba46c7 |
# under the prefix. The with-fhs option will use /usr,
|
|
|
ba46c7 |
# /etc, and /var. The with-fhs-opt option will use the
|
|
|
ba46c7 |
diff --git a/configure.ac b/configure.ac
|
|
|
ba46c7 |
index e3ca730..2376b34 100644
|
|
|
ba46c7 |
--- a/configure.ac
|
|
|
ba46c7 |
+++ b/configure.ac
|
|
|
ba46c7 |
@@ -231,6 +231,8 @@ AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
|
|
|
ba46c7 |
|
|
|
ba46c7 |
m4_include(m4/fhs.m4)
|
|
|
ba46c7 |
|
|
|
ba46c7 |
+localrundir='/run'
|
|
|
ba46c7 |
+
|
|
|
ba46c7 |
# installation paths - by default, we store everything
|
|
|
ba46c7 |
# under the prefix. The with-fhs option will use /usr,
|
|
|
ba46c7 |
# /etc, and /var. The with-fhs-opt option will use the
|
|
|
ba46c7 |
--
|
|
|
ba46c7 |
1.7.1
|
|
|
ba46c7 |
|