From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 5CE9C1F463 for ; Wed, 27 Nov 2019 12:17:42 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] Makefile.PL: MANIFEST dependency fix Date: Wed, 27 Nov 2019 12:17:42 +0000 Message-Id: <20191127121742.6953-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We need to force an update to Makefile (not Makefile.PL) when MANIFEST changes. Since "Makefile" (aka. "$(FIRST_MAKEFILE)") is already a single-colon make target; we can't create a double-colon rule to augment it. So we'll continue using a "Makefile.PL" rule, but have it recreate the resulting Makefile Finally, change the "check" target to use "prove -b" instead of "prove -l" so we test against "blib/lib", since what's in the "blib" dir will be installed. Fixes: 4c20de0694d06ff3 ("Makefile.PL: add dependency on MANIFEST contents") --- Makefile.PL | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index f650fdea..4aa0caa7 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -86,13 +86,16 @@ check-manifest :: MANIFEST if git ls-files >\$?.gen 2>&1; then diff -u \$? \$?.gen; fi check:: pure_all check-manifest - \$(EATMYDATA) prove -lvw -j\$(N) + \$(EATMYDATA) prove -bvw -j\$(N) lib/PublicInbox/UserContent.pm :: contrib/css/216dark.css \$(PERL) -I lib \$@ \$? -# Ensure new .pm files will always be installed: -Makefile.PL :: MANIFEST +# Ensure new .pm files will always be installed by updating +# the timestamp of Makefile.PL which forces Makefile to be remade +Makefile.PL : MANIFEST + touch -r \$< \$@ + \$(PERLRUN) \$@ EOF }