Applied one patch, need more info for the other.

diff --git a/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn b/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn
index 4b84e56b5b505be8a0a9f2c2a4334e21d778f8d9..0a80647c78558a2dcafd23fdbdf372baa80afcc6 100644 (file)
--- a/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn
+++ b/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn
@@ -16,6 +16,12 @@ index 5b0eb74..94adb0f 100755
                 'XML::Simple'           => "0",
 """]]
 
                 'XML::Simple'           => "0",
 """]]
 

+> This change certainly looks plausible, but I maintain a package
+> of ikiwiki in a build system that sets `DESTDIR`, and I've not
+> noticed any problems there. Would you be willing to do one more
+> build in your environment without this change, so that we can
+> understand the problem it's trying to fix? --[[schmonz]]
+

 Also, the `po/Makefile` presumes the use of `make`, explicitly.  If you use another build tool it fails (ironically I was actually using `gmake` in non-gnu environment so it wasn't aliased to `make`).  Switch from the explicit call to the generic recall variable `$(MAKE)`.
 
 [[!format diff """
 Also, the `po/Makefile` presumes the use of `make`, explicitly.  If you use another build tool it fails (ironically I was actually using `gmake` in non-gnu environment so it wasn't aliased to `make`).  Switch from the explicit call to the generic recall variable `$(MAKE)`.
 
 [[!format diff """


@@ -34,6 +40,11 @@ index 5ec4a15..4d1d33e 100644
         cd .. && ./Makefile.PL
 """]]
 
         cd .. && ./Makefile.PL
 """]]
 

+> This change looks more obviously correct, and I understand exactly
+> I haven't encountered the problem you have (my build system ensures
+> that `make` gets me `gmake` for ikiwiki). Cherry-picked, with amended
+> commit message. --[[schmonz]]
+

 Note following comments by [[Joey]] via github
 
 > These are not mergeable in their current state.
 Note following comments by [[Joey]] via github
 
 > These are not mergeable in their current state.