changeset 17593:2e8cfcbe1d52

relocatable-shell: Update suggested usage in maintainer documentation. Instead of suggesting an inline usage of "sed", that would have to be cut-and-pasted for every directory to be relocated, suggest a shell function. Make the example obviously an example, whereas previously it looked like it might be literal text. Thanks to Reuben Thomas <rrt@sc3d.org> for pointing out these issues. See http://lists.gnu.org/archive/html/bug-gnulib/2014-01/msg00039.html for further context.
author Ben Pfaff <blp@cs.stanford.edu>
date Wed, 08 Jan 2014 22:15:21 -0800
parents 91b9d687d468
children 23cb5b2fd95b
files doc/relocatable-maint.texi
diffstat 1 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/doc/relocatable-maint.texi	Tue Jan 07 21:43:07 2014 -0800
+++ b/doc/relocatable-maint.texi	Wed Jan 08 22:15:21 2014 -0800
@@ -122,17 +122,26 @@
   orig_installdir="$bindir" # see Makefile.am's *_SCRIPTS variables
   func_find_curr_installdir # determine curr_installdir
   func_find_prefixes
-  # Relocate the directory variables that we use.
-  gettext_dir=`
-    echo "$gettext_dir/" \
+  relocate () @{
+    echo "$1/" \
     | sed -e "s%^$@{orig_installprefix@}/%$@{curr_installprefix@}/%" \
-    | sed -e 's,/$,,'`
+    | sed -e 's,/$,,'
+  @}
+else
+  relocate () @{
+    echo "$1"
+  @}
 fi
+
+# Get some relocated directory names.
+sysconfdir=`relocate "@@sysconfdir@@"`
+some_datadir=`relocate "@@datadir@@/something"`
 @end example
 
 You must adapt the definition of @code{orig_installdir}, depending on
 where the script gets installed.  Also, at the end, instead of
-@code{gettext_dir}, transform those variables that you need.
+@code{sysconfdir} and @code{some_datadir}, transform those variables
+that you need.
 
 @item
 In your @file{Makefile.am}, for every program @command{foo} that gets