From ad44350ecf956894238841b387125ab9824e3850 Mon Sep 17 00:00:00 2001 From: Björn Persson Date: Thu, 10 Oct 2013 15:21:47 +0200 Subject: 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. --- comfignat.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'comfignat.mk') 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}}"' -- cgit v1.2.3