On 10.01.2014 06:12, Ben Pfaff wrote:
>>>>> It looks to me like you don't have direct access to the gnulib Git
>>>>> repository. Do you want me to apply this on your behalf?
>>>>
>>>> Yes please.
>>>
>>> OK, I'll do that tonight.
>
> Thanks, I'll do that in a minute.
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 {
./relocatable-maint.texi:157: misplaced {
./relocatable-maint.texi:159: misplaced {
./relocatable-maint.texi:162: misplaced }
./relocatable-maint.texi:164: misplaced }
./relocatable-maint.texi:165: misplaced }
Makefile:21: recipe for target 'gnulib.info' failed
Escaping the braces as per the attached patch seems to fix this.
Cheers, Daniel
>From 11b36881c7e83400bce94f413873ad2229237a17 Mon Sep 17 00:00:00 2001
From: Daniel Albers <dan...@lbe.rs>
Date: Thu, 16 Jan 2014 12:05:34 +0100
Subject: [PATCH] relocatable-maint.texi: escape braces
---
doc/relocatable-maint.texi | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/relocatable-maint.texi b/doc/relocatable-maint.texi
index 23b5048..696b350 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@@");
--
1.8.5.2
