Better hashbang when perl is not in /usr/bin

Thanks H.Merijn Brand for suggesting this!

diff --git a/Makefile b/Makefile
index 9a807b5cf5d8de987ac197087637a688b2437fe3..98edc9b22227b1d935fb54d9f5b24901e98e2959 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,11 @@ all: build
 
 build: ${NAME}.1
        -mkdir build
-       sed -e "s,@PREFIX@,${PREFIX},;s,@LIBDIR@,${LIBDIR},;s,@VERSION@,${VERSION},;s,@DATADIR@,${DATADIR}," < ${NAME} > build/${NAME}
+       perl -MConfig -p -e'1..1 and s/.*/$$Config{startperl}/;' \
+               -e's,\@PREFIX\@,${PREFIX},;' \
+               -e's,\@LIBDIR\@,${LIBDIR},;' \
+               -e's,\@VERSION\@,${VERSION},;' \
+               -e's,\@DATADIR\@,${DATADIR},' ${NAME} > build/${NAME}
        cp -p $< build/$<
        ${MAKE} -C po build
 

diff --git a/clawsker b/clawsker
index 7ccb9423937cc85823b528ebc2c230235af998e9..210f28404ccf26639b2e2f143c365bcb877e059f 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # Clawsker :: A Claws Mail Tweaker
 # Copyright 2007-2018 Ricardo Mones <ricardo@mones.org>
@@ -14,6 +14,7 @@
 package Clawsker;
 use 5.010_000;
 use strict;
+use warnings;
 use utf8;
 use version 0.77;
 use Glib qw(TRUE FALSE);