diff --git a/.gitignore b/.gitignore index 1a956403..ecea19d3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ Makefile blib/ pm_to_blib rem2pdf/Makefile.top +rem2pdf/bin/rem2pdf diff --git a/configure b/configure index 6bd7246a..a416791e 100755 --- a/configure +++ b/configure @@ -4005,7 +4005,7 @@ done VERSION=03.03.12 -ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top" +ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4704,6 +4704,7 @@ do "rem2html/Makefile") CONFIG_FILES="$CONFIG_FILES rem2html/Makefile" ;; "rem2pdf/Makefile.PL") CONFIG_FILES="$CONFIG_FILES rem2pdf/Makefile.PL" ;; "rem2pdf/Makefile.top") CONFIG_FILES="$CONFIG_FILES rem2pdf/Makefile.top" ;; + "rem2pdf/bin/rem2pdf") CONFIG_FILES="$CONFIG_FILES rem2pdf/bin/rem2pdf" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.in b/configure.in index 0a318068..4671fede 100644 --- a/configure.in +++ b/configure.in @@ -49,4 +49,4 @@ AC_CHECK_FUNCS(setenv unsetenv glob mbstowcs setlocale initgroups) VERSION=03.03.12 AC_SUBST(VERSION) AC_SUBST(PERL) -AC_OUTPUT(src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top) +AC_OUTPUT(src/Makefile www/Makefile src/version.h rem2html/Makefile rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf) diff --git a/rem2pdf/bin/rem2pdf b/rem2pdf/bin/rem2pdf.in similarity index 98% rename from rem2pdf/bin/rem2pdf rename to rem2pdf/bin/rem2pdf.in index 126358b0..62e61624 100755 --- a/rem2pdf/bin/rem2pdf +++ b/rem2pdf/bin/rem2pdf.in @@ -1,4 +1,4 @@ -#!/bin/env perl +#!@PERL@ use strict; use warnings; @@ -7,6 +7,8 @@ use Cairo; use Pango; use Getopt::Long; +my $VERSION = '@VERSION@'; + use Remind::PDF; my $media_to_size = { @@ -62,7 +64,7 @@ $me =~ s/^.*\///; sub usage { print <<"EOF"; -$me: Convert Remind -pp output to a PDF calendar. +$me (version $VERSION): Convert Remind -pp output to a PDF calendar. Usage: remind -pp [options] filename | $me [options] > out.pdf