diff options
| author | Björn Persson <bjorn@rombobjörn.se> | 2013-10-10 15:21:47 +0200 |
|---|---|---|
| committer | Björn Persson <bjorn@rombobjörn.se> | 2013-10-10 15:21:47 +0200 |
| commit | ad44350ecf956894238841b387125ab9824e3850 (patch) | |
| tree | cfc72da024fb7317b4f6728001b2b6fcee57295c /comfignat.mk | |
| parent | 0a7d36c71e387b5c2fa95fb14685ea274e6d5aca (diff) | |
Made Bindir relative to Libexecdir.
When directory variables in project files are relative pathnames, then
Comfignat.Bindir is now relative to Comfignat.Libexecdir, while the other
pathnames are relative to Comfignat.Bindir. This should help programs in
Libexecdir figure out the pathnames of files they need.
The manual now also notes that runstatedir and lockdir are always absolute.
Diffstat (limited to 'comfignat.mk')
| -rw-r--r-- | comfignat.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/comfignat.mk b/comfignat.mk index cc11575..09ec0eb 100644 --- a/comfignat.mk +++ b/comfignat.mk @@ -373,7 +373,7 @@ maybe_relative_to = \ # maybe_relative_to converts an absolute pathname into a relative one if a # relocatable package is desired. # Parameters: -# 1: an absolute pathname to convert to relative +# 1: an absolute pathname to maybe convert to relative # 2: the absolute base pathname that 1 may be made relative to # First check that the value of relocatable_package is a single word and that # that word is either "true" or "false". Complain and stop if that isn't so. @@ -420,7 +420,7 @@ ifeq (${dirgpr},) # directory variables to comfignat.gpr, and convey the usage-relevant ones # to usage projects in the form that usage projects need. - all_directories += '-DBindir="${call embed_pathname,${bindir}}"' + all_directories += '-DBindir="${call maybe_relative_to,${bindir},${libexecdir}}"' all_directories += '-DLibexecdir="${call embed_pathname,${libexecdir}}"' all_directories += '-DIncludedir="${call embed_pathname,${includedir}}"' all_directories += '-DArchincludedir="${call embed_pathname,${archincludedir}}"' |