1 The `PM_FILTER` doesn't include the `DESTDIR` variable. This means that, if you use it with your build, it's incoherent to the rest of the build; i.e. the `INSTALLDIR_AUTOREPLACE` doesn't include it. Honestly I can't recall what the final effect of that was but the following [[patch]] fixed it.
4 diff --git a/Makefile.PL b/Makefile.PL
5 index 5b0eb74..94adb0f 100755
8 @@ -194,7 +194,7 @@ coverage:
11 PREFIX => "/usr/local",
12 - PM_FILTER => './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
13 + PM_FILTER => './pm_filter $(DESTDIR)$(PREFIX) $(VER) $(PROBABLE_INST_LIB)',
19 > This change certainly looks plausible, but I maintain a package
20 > of ikiwiki in a build system that sets `DESTDIR`, and I've not
21 > noticed any problems there. Would you be willing to do one more
22 > build in your environment without this change, so that we can
23 > understand the problem it's trying to fix? --[[schmonz]]
25 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)`.
28 diff --git a/po/Makefile b/po/Makefile
29 index 5ec4a15..4d1d33e 100644
32 @@ -84,7 +84,7 @@ underlays: ../ikiwiki.out underlays_copy_stamp
33 ../ikiwiki.out -libdir .. -setup underlay.setup -refresh
35 ../ikiwiki.out: ../Makefile
36 - make -C .. ikiwiki.out
37 + $(MAKE) -C .. ikiwiki.out
39 ../Makefile: ../Makefile.PL
40 cd .. && ./Makefile.PL
43 > This change looks more obviously correct, and I understand exactly
44 > I haven't encountered the problem you have (my build system ensures
45 > that `make` gets me `gmake` for ikiwiki). Cherry-picked, with amended
46 > commit message. --[[schmonz]]
48 Note following comments by [[Joey]] via github
50 > These are not mergeable in their current state.
52 > *Pull 'DESTDIR' update to 'Makefile.PL' from mixed-master.*
54 > This doesn't explain
56 > * what the problem was
57 > * how the change fixed it
58 > * why the change is correct
60 >> No, I suppose not; I won't explain. Hopefully the above clarifies. -- [[ttw]]
62 > *Re-merge from 'joeyh' to new, clean head.*
64 > I have no idea what the above commit is doing, but it somehow makes changes to 432 files?!
66 >> Yeah, sort of. I'm not very good with computers ... specifically, with `git` and stuff. The diff between my `master` and your `master` is only two files so hopefully it *is* actually doing what's intended (that is, those changes are from your repository into my own -- I "rebased" my own in an attempt to simplify things). Anyway. -- [[ttw]]
68 > *Pull the 'po/Makefile' change from the mixed-master.*
70 > This one is adding a $(MAKE) where there was a make. Which is fine, but the commit message is again, horrible. What is the mixed-master? Describe the change you are making, not your internal process for making it.
72 >> Note to others, `graft` from `hg` doesn't pull original commit messages the way you wish it did (or I did something wrong ... more likely). -- [[ttw]]
74 > Also, please don't use github pull requests for ikiwiki. Post todo items on ikiwiki.info with a link to your git repository and branches to be merged.
76 >> NP. [[http://github.com/ttw/ikiwiki]]; `master` branch. -- [[ttw]]