From 0a7d36c71e387b5c2fa95fb14685ea274e6d5aca Mon Sep 17 00:00:00 2001
From: Björn Persson <bjorn@rombobjörn.se>
Date: Wed, 9 Oct 2013 21:09:42 +0200
Subject: Renamed runtimedir to runstatedir.

A new variable named runstatedir has been defined in the GNU Coding Standards.
Comfignat had runtimedir for the same purpose. The name is now changed to keep
Comfignat compatible with the GNU Coding Standards. This change also improves
the documentation of runstatedir and lockdir.
---
 comfignat.mk | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'comfignat.mk')

diff --git a/comfignat.mk b/comfignat.mk
index c22ede5..cc11575 100644
--- a/comfignat.mk
+++ b/comfignat.mk
@@ -99,6 +99,8 @@ sysconfdir     = ${prefix}/etc
 statedir       = ${localstatedir}/lib
 cachedir       = ${localstatedir}/cache
 logdir         = ${localstatedir}/log
+runstatedir    = /run
+lockdir        = ${runstatedir}/lock
 includedir     = ${prefix}/include
 archincludedir = ${includedir}
 libdir         = ${exec_prefix}/lib
@@ -108,8 +110,6 @@ localedir      = ${datarootdir}/locale
 mandir         = ${datarootdir}/man
 infodir        = ${datarootdir}/info
 miscdocdir     = ${datarootdir}/doc
-runtimedir     = /run
-lockdir        = ${runtimedir}/lock
 # These are the directories where different kinds of files will be located on
 # the target system.
 
@@ -249,9 +249,10 @@ configuration_variables += \
    DESTDIR \
    dirgpr relocatable_package \
    prefix exec_prefix datarootdir localstatedir \
-   bindir libexecdir datadir sysconfdir statedir cachedir logdir \
+   bindir libexecdir \
+   datadir sysconfdir statedir cachedir logdir runstatedir lockdir \
    includedir archincludedir libdir alidir gprdir \
-   localedir mandir infodir miscdocdir runtimedir lockdir \
+   localedir mandir infodir miscdocdir \
    objdir stagedir \
    install_cp_flags \
    ${options}
@@ -406,11 +407,11 @@ all_directories += '-DLocaledir="${call embed_pathname,${localedir}}"'
 all_directories += '-DMandir="${call embed_pathname,${mandir}}"'
 all_directories += '-DInfodir="${call embed_pathname,${infodir}}"'
 all_directories += '-DMiscdocdir="${call embed_pathname,${miscdocdir}}"'
-all_directories += '-DRuntimedir="${runtimedir}"'
+all_directories += '-DRunstatedir="${runstatedir}"'
 all_directories += '-DLockdir="${lockdir}"'
-# runtimedir and lockdir belong to the operating system and are used for
+# runstatedir and lockdir belong to the operating system and are used for
 # communication between subsystems. It wouldn't make sense for an application
-# to have its own runtimedir. Therefore these variables are always absolute
+# to have its own runstatedir. Therefore these variables are always absolute
 # pathnames.
 
 ifeq (${dirgpr},)
-- 
cgit v1.2.3