aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2014-12-27 17:28:28 -0500
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2014-12-27 17:28:28 -0500
commiteacb0c3196953d8620de5e50a4a406a87d4d2553 (patch)
treeacc53daefc273831e14434c1cbe956daebaaa2c8
parent6b7a2657ae69e6afd52ce58cf4f0b4190e75933b (diff)
downloadikiwiki-eacb0c3196953d8620de5e50a4a406a87d4d2553.tar
ikiwiki-eacb0c3196953d8620de5e50a4a406a87d4d2553.tar.gz
Applied one patch, need more info for the other.
-rw-r--r--doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn11
1 files changed, 11 insertions, 0 deletions
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 4b84e56b5..0a80647c7 100644
--- 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",
"""]]
+> 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 """
@@ -34,6 +40,11 @@ index 5ec4a15..4d1d33e 100644
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.