From 6c7b560bbeccdf1cfbd0008992c05f63952984b3 Mon Sep 17 00:00:00 2001 From: Daniel Albers Date: Thu, 16 Jan 2014 12:56:52 +0100 Subject: [PATCH] relocatable-maint.texi: escape braces The change causes makeinfo 5.2 to fail: env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo --no-split --reference-limit=2000 gnulib.texi ./relocatable-maint.texi:153: misplaced { ... Escaping the braces as per the attached patch seems to fix this. --- ChangeLog | 5 +++++ doc/relocatable-maint.texi | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a2ccf911..9a9f00bef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-01-16 Daniel Albers (tiny change) + + relocatable-perl: fix texi syntax + * doc/relocatable-maint.texi: Escape braces. + 2014-01-09 Reuben Thomas relocatable-perl: like relocatable-script, but for Perl scripts diff --git a/doc/relocatable-maint.texi b/doc/relocatable-maint.texi index 23b504874..696b3500d 100644 --- a/doc/relocatable-maint.texi +++ b/doc/relocatable-maint.texi @@ -150,19 +150,19 @@ Perl script that your package installs, add the following: @example @@relocatable_pl@@ -if ("@@RELOCATABLE@@" eq "yes") { +if ("@@RELOCATABLE@@" eq "yes") @{ my $exec_prefix = "@@exec_prefix@@"; my $orig_installdir = "@@bindir@@"; # see Makefile.am's *_SCRIPTS variables my ($orig_installprefix, $curr_installprefix) = find_prefixes($orig_installdir, find_curr_installdir()); - sub relocate { # the subroutine is defined whether or not the enclosing block is executed + sub relocate @{ # the subroutine is defined whether or not the enclosing block is executed my ($dir) = @@_; - if ("@@RELOCATABLE@@" eq "yes") { + if ("@@RELOCATABLE@@" eq "yes") @{ $dir =~ s%^$orig_installprefix/%$curr_installprefix/%; $dir =~ s,/$,,; - } + @} return $dir; - } -} + @} +@} # Get some relocated directory names. $sysconfdir = relocate("@@sysconfdir@@"); -- 2.11.0