Added more directory variables.

1 files changed, 17 insertions, 10 deletions

diff --git a/comfignat.mk b/comfignat.mk
index d406fef..7b9a19d 100644
--- a/comfignat.mk
+++ b/comfignat.mk
@@ -73,6 +73,13 @@ dirgpr =
 # will be derived from dirgpr, and project files will be configured to use the
 # directories project.
 
+relocatable_package = false
+# If relocatable_package is true, then directory variables in project files
+# will be configured with relative pathnames so that the installed directory
+# tree as a whole can be moved to another location in the filesystem without
+# breaking the project files.
+# dirgpr takes precedence over relocatable_package.
+
 prefix        = /usr/local
 exec_prefix   = ${prefix}
 bindir        = ${exec_prefix}/bin
@@ -81,12 +88,18 @@ datarootdir   = ${prefix}/share
 datadir       = ${datarootdir}
 sysconfdir    = ${prefix}/etc
 localstatedir = ${prefix}/var
+statedir      = ${localstatedir}/lib
+cachedir      = ${localstatedir}/cache
+logdir        = ${localstatedir}/log
+runtimedir    = /run
+lockdir       = ${runtimedir}/lock
 includedir    = ${prefix}/include
 libdir        = ${exec_prefix}/lib
 gprdir        = ${datarootdir}/gpr
 localedir     = ${datarootdir}/locale
 mandir        = ${datarootdir}/man
 infodir       = ${datarootdir}/info
+miscdocdir    = ${datarootdir}/doc
 # These are the directories where different kinds of files will be installed on
 # the target system. Some of these directory variables aren't used in this file
 # but may be needed in containing makefiles.
@@ -101,13 +114,6 @@ stagedir = ${builddir}/stage
 # Containing makefiles should avoid modifying the directory variables. Users
 # should be able to rely on these defaults.
 
-relocatable_package = false
-# If relocatable_package is true, then directory variables in project files
-# will be configured with relative pathnames so that the installed directory
-# tree as a whole can be moved to another location in the filesystem without
-# breaking the project files.
-# dirgpr takes precedence over relocatable_package.
-
 install_cp_flags = ${if ${DESTDIR},--preserve=timestamps,}
 # Timestamps are preserved when installation is done to a staging directory. 
 # This matters for files that aren't generated during the build but copied from
@@ -123,9 +129,10 @@ install_cp_flags = ${if ${DESTDIR},--preserve=timestamps,}
 configuration_variables += \
    GNATPREP GNAT_BUILDER GNAT_BUILDER_FLAGS ADAFLAGS CPPFLAGS CFLAGS CXXFLAGS \
    FFLAGS GNATBINDFLAGS GNATLINKFLAGS LDFLAGS GNATFLAGS DESTDIR \
-   dirgpr prefix exec_prefix bindir libexecdir datarootdir datadir sysconfdir \
-   localstatedir includedir libdir gprdir localedir mandir infodir builddir \
-   objdir stagedir relocatable_package install_cp_flags
+   dirgpr relocatable_package prefix exec_prefix bindir libexecdir datarootdir \
+   datadir sysconfdir localstatedir statedir cachedir logdir runtimedir \
+   lockdir includedir libdir gprdir localedir mandir infodir miscdocdir \
+   builddir objdir stagedir install_cp_flags
 # configuration_variables is a list of variables that can be saved in the
 # persistent configuration with "make configure". Containing makefiles may
 # append additional variable names.