From: Akim Demaille Date: Sun, 13 Jan 2019 18:48:35 +0000 (+0100) Subject: relocatable: improve documentation X-Git-Tag: v1.0~5160 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c66547cdce3cdaf4c7963a73218e4aab56ed89a0;p=gnulib.git relocatable: improve documentation * doc/relocatable-maint.texi (Supporting Relocation): For substitutions performed by config.status, we need more variables (for instance datarootdir defaults to '${prefix}/share' so we need prefix). --- diff --git a/ChangeLog b/ChangeLog index bc7b953bc3..b32b4228a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-01-13 Akim Demaille + + relocatable: improve documentation. + * doc/relocatable-maint.texi (Supporting Relocation): For + substitutions performed by config.status, we need more variables + (for instance datarootdir defaults to '${prefix}/share' so we need + prefix). + 2019-01-13 Akim Demaille backup: update dependencies diff --git a/doc/relocatable-maint.texi b/doc/relocatable-maint.texi index d1e7090bc0..b95caaf7c3 100644 --- a/doc/relocatable-maint.texi +++ b/doc/relocatable-maint.texi @@ -122,8 +122,12 @@ shell script that your package installs, add the following: @smallexample @@relocatable_sh@@ + +prefix="@@prefix@@" +exec_prefix="@@exec_prefix@@" # usually needs $prefix. +datarootdir="@@datarootdir@@" # usually needs $prefix. + if test "@@RELOCATABLE@@" = yes; then - exec_prefix="@@exec_prefix@@" bindir="@@bindir@@" orig_installdir="$bindir" # see Makefile.am's *_SCRIPTS variables func_find_curr_installdir # determine curr_installdir @@ -140,8 +144,9 @@ else fi # Get some relocated directory names. -sysconfdir=`relocate "@@sysconfdir@@"` -some_datadir=`relocate "@@datadir@@/something"` +sysconfdir=`relocate "@@sysconfdir@@"` # usually needs $prefix. +some_datadir=`relocate "@@datadir@@/something"` # usually needs $datarootdir. +bindir=`relocate "@@bindir@@"` # usually needs $exec_prefix, hence $prefix. @end smallexample You must adapt the definition of @code{orig_installdir}, depending on