Merge remote-tracking branch 'origin/xap-optional' into master

[public-inbox.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index b8576674f072d56496fab9c7c54a87fcf8ca4e88..de0c49fd8e2c5660c08f913cadd1371e4b7e7116 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -34,12 +34,9 @@ WriteMakefile(
                'Email::MIME::ContentType' => 0,
                'Email::Simple' => 0,
 
-               # "libencode-perl" on Debian, `perl5' on FreeBSD
-               'Encode::MIME::Header' => 0,
-
-               # libperl$PERL_VERSION on Debian, `perl5' on FreeBSD,
-               # but Fedora seems to need this separately
-               'Devel::Peek' => 0,
+               # libperl$PERL_VERSION or libencode-perl on Debian,
+               # `perl5' on FreeBSD
+               'Encode' => 0,
 
                # TODO: these should really be made optional...
                'Plack' => 0,
@@ -58,7 +55,7 @@ sub MY::postamble {
 EATMYDATA =
 -include config.mak
 -include Documentation/include.mk
-N ?= \$(shell echo \$\$(( \$\$(nproc 2>/dev/null || echo 2) + 1)))
+N = \$\$(( \$\$(nproc 2>/dev/null || gnproc 2>/dev/null || echo 2) + 1 ))
 SCRIPTS := scripts/ssoma-replay
 my_syntax := \$(addsuffix .syntax, $PM_FILES \$(EXE_FILES) \$(SCRIPTS))
 
@@ -69,13 +66,13 @@ my_syntax := \$(addsuffix .syntax, $PM_FILES \$(EXE_FILES) \$(SCRIPTS))
 syntax:: \$(my_syntax)
 
 check-manifest :: MANIFEST
-       if git ls-files >\$<.gen 2>&1; then diff -u \$< \$<.gen; fi
+       if git ls-files >\$?.gen 2>&1; then diff -u \$? \$?.gen; fi
 
 check:: pure_all check-manifest
        \$(EATMYDATA) prove -lv -j\$(N)
 
 lib/PublicInbox/UserContent.pm :: contrib/css/216dark.css
-       @\$(PERL) -I lib \$@ \$<
+       \$(PERL) -I lib \$@ \$?
 
 EOF
 }