From 0a7d36c71e387b5c2fa95fb14685ea274e6d5aca Mon Sep 17 00:00:00 2001 From: Björn Persson 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. --- INSTALL | 20 ++++++++++---------- comfignat.gpr.gp | 38 +++++++++++++++++++------------------- comfignat.mk | 15 ++++++++------- manual.en.html | 10 ++++++++++ 4 files changed, 47 insertions(+), 36 deletions(-) diff --git a/INSTALL b/INSTALL index 5a45025..10e53ff 100644 --- a/INSTALL +++ b/INSTALL @@ -112,6 +112,16 @@ are relevant during the build: logdir The top-level directory for log files. Default: /log + runstatedir + The top-level directory for small files that describe the state of the + system and that exist only while some subsystem is running, such as process + identifier files and transient Unix-domain sockets. Default: /run + + lockdir + The top-level directory for lock files that are used to prevent multiple + programs from trying to access a device or other resource at the same time. + Default: /lock + includedir The top-level directory for source files to be used in the compilation of software using libraries, used only if no directories project is provided. @@ -155,16 +165,6 @@ are relevant during the build: The parent of the application-specific directory for miscellaneous documentation files. Default: /doc - runtimedir - The top-level directory for files that describe the state of the system and - that exist only while some subsystem is running, such as process identifier - files and transient Unix-domain sockets. Default: /run - - lockdir - The top-level directory for lock files that are used to prevent multiple - programs from trying to access a device or other resource at the same time. - Default: /lock - If you want to install to a staging directory from which the files will later be copied to their final locations, then set DESTDIR to the staging directory. All the other directory variables shall be the final locations. Unlike the diff --git a/comfignat.gpr.gp b/comfignat.gpr.gp index 22fab2d..4c9d8eb 100644 --- a/comfignat.gpr.gp +++ b/comfignat.gpr.gp @@ -136,6 +136,25 @@ abstract project Comfignat is Logdir := Localstatedir & "/log"; #end if; + -- Small files that take part in describing the state of the system and that + -- exist only while the program is running, such as process identifier files + -- and transient Unix-domain sockets, shall be sought and created under + -- Runstatedir. (This is NOT the place for temporary files in general.) + #if Runstatedir'Defined then + Runstatedir := $Runstatedir; + #else + Runstatedir := "/run"; + #end if; + + -- Lock files that are used to prevent multiple programs from trying to + -- access a device or other resource at the same time shall be sought and + -- created under Lockdir. + #if Lockdir'Defined then + Lockdir := $Lockdir; + #else + Lockdir := Runstatedir & "/lock"; + #end if; + -- Source files to be used in the compilation of software using libraries -- are under Includedir. #if Includedir'Defined then @@ -203,25 +222,6 @@ abstract project Comfignat is Miscdocdir := Datarootdir & "/doc"; #end if; - -- Small files that take part in describing the state of the system, and - -- that exist only while the program is running, such as process identifier - -- files and transient Unix-domain sockets, shall be created under - -- Runtimedir. (This is NOT the place for temporary files in general.) - #if Runtimedir'Defined then - Runtimedir := $Runtimedir; - #else - Runtimedir := "/run"; - #end if; - - -- Lock files that are used to prevent multiple programs from trying to - -- access a device or other resource at the same time shall be created under - -- Lockdir. - #if Lockdir'Defined then - Lockdir := $Lockdir; - #else - Lockdir := Runtimedir & "/lock"; - #end if; - -- -- The following variables are for use in attributes to control where 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},) diff --git a/manual.en.html b/manual.en.html index d46954d..d0aff66 100755 --- a/manual.en.html +++ b/manual.en.html @@ -280,6 +280,16 @@ to create the subdirectory under stage_cachedir.

install log files but you may want to create a separate subdirectory under stage_logdir if your program writes its own log files.

+

  • Small files that take part in describing the state of the system and +that exist only while the program is running, such as process identifier files +and transient Unix-domain sockets, shall be sought and created under +Comfignat.Runstatedir. (This is not the place for +temporary files in general.)

    • + +

  • Lock files that are used to prevent multiple programs from trying to +access a device or other resource at the same time shall be sought and created +under Comfignat.Lockdir.

    • +

  • Ada specifications, C headers and other source files that are needed for compilation of other software that uses your libraries shall be placed under Comfignat.Stage_Includedir by build project files, usually under a -- cgit v1.2.3