I'm still not sure I'm really getting the issue but I have an idea:
would a separate make target "install-sample-configs" work that
unconditionally puts the samples in place? That's something we could
still add to 2.2 even at this point as it doesn't interfere with
anything else.
Robin