diff --git a/.gitignore b/.gitignore index 4aafadd8..6dc01e49 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ rem2pdf/Makefile.PL rem2pdf/Makefile.old rem2pdf/Makefile.top rem2pdf/bin/rem2pdf +scripts/tkremind set-irc-topic src/*.tar.gz* src/Makefile diff --git a/Makefile b/Makefile index 0565b820..bd3bc2fa 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ install: @$(MAKE) -C rem2pdf -f Makefile.top install INSTALL_BASE=$(INSTALL_BASE) clean: find . -name '*~' -exec rm {} \; - -rm man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 + -rm man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind -$(MAKE) -C src clean -$(MAKE) -C rem2pdf clean diff --git a/configure b/configure index 25a9b005..5d6650c7 100755 --- a/configure +++ b/configure @@ -4202,7 +4202,7 @@ VERSION=$PACKAGE_VERSION -ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2html/rem2html rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1" +ac_config_files="$ac_config_files src/Makefile www/Makefile src/version.h rem2html/Makefile rem2html/rem2html rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4903,6 +4903,7 @@ do "man/rem2ps.1") CONFIG_FILES="$CONFIG_FILES man/rem2ps.1" ;; "man/remind.1") CONFIG_FILES="$CONFIG_FILES man/remind.1" ;; "man/tkremind.1") CONFIG_FILES="$CONFIG_FILES man/tkremind.1" ;; + "scripts/tkremind") CONFIG_FILES="$CONFIG_FILES scripts/tkremind" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.in b/configure.in index 932e886c..2eca8d07 100644 --- a/configure.in +++ b/configure.in @@ -91,6 +91,6 @@ AC_SUBST(VERSION) AC_SUBST(PERL) AC_SUBST(PERLARTIFACTS) AC_SUBST(RELEASE_DATE) -AC_CONFIG_FILES([src/Makefile www/Makefile src/version.h rem2html/Makefile rem2html/rem2html rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1]) +AC_CONFIG_FILES([src/Makefile www/Makefile src/version.h rem2html/Makefile rem2html/rem2html rem2pdf/Makefile.PL rem2pdf/Makefile.top rem2pdf/bin/rem2pdf man/rem.1 man/rem2ps.1 man/remind.1 man/tkremind.1 scripts/tkremind]) AC_OUTPUT chmod a+x rem2pdf/bin/rem2pdf diff --git a/scripts/tkremind b/scripts/tkremind.in similarity index 99% rename from scripts/tkremind rename to scripts/tkremind.in index f6d5a219..e1597b91 100755 --- a/scripts/tkremind +++ b/scripts/tkremind.in @@ -780,7 +780,7 @@ proc EditOptions {} { pack $w.f -side top -expand 1 -fill both pack $w.b -side top -expand 0 -fill x - label $w.ver -text "TkRemind version $ver on Tcl/Tk version [info tclversion]" + label $w.ver -text "TkRemind version @VERSION@ on Tcl/Tk version [info tclversion]" pack $w.ver -in $w.f -side top -expand 0 -fill x # Start iconified checkbutton $w.startIconified -text "Start up Iconified" \