From 9f54744e4e0fa27e10f773b4744ec1e57449f7c1 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sat, 11 Mar 2006 03:15:12 +0000 Subject: [PATCH] "source version" doesn't work with the /bin/sh in OpenBSD. :-/ There seems no choice but to hardwire the version number in xcurses-config.in. --- configure | 2 -- configure.in | 4 ---- xcurses-config.in | 9 ++++++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 4f096811..006d5081 100755 --- a/configure +++ b/configure @@ -3012,8 +3012,6 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g -s%@VER@%$VER%g -s%@VERDOT@%$VERDOT%g s%@CC@%$CC%g s%@host@%$host%g s%@host_alias@%$host_alias%g diff --git a/configure.in b/configure.in index 50310c0c..5de1726d 100755 --- a/configure.in +++ b/configure.in @@ -2,10 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(curspriv.h) AC_PREFIX_DEFAULT(/usr) -source version - -AC_SUBST(VER) -AC_SUBST(VERDOT) AC_SUBST(prefix) dnl ---------------------- check for C compiler ----------------- diff --git a/xcurses-config.in b/xcurses-config.in index b09d8950..aca9615b 100755 --- a/xcurses-config.in +++ b/xcurses-config.in @@ -3,8 +3,11 @@ # The idea to this kind of setup info script was stolen from numerous # other packages, such as neon, libxml and gnome. # -# $Id: xcurses-config.in,v 1.5 2006/02/17 03:25:33 wmcbrine Exp $ +# $Id: xcurses-config.in,v 1.6 2006/03/11 03:15:12 wmcbrine Exp $ # + +verdot=2.8 + prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@/xcurses @@ -23,7 +26,7 @@ usage() echo " --prefix PDCurses install prefix" echo " [$prefix]" echo " --version output version information" - echo " [@VERDOT@]" + echo " [$verdot]" exit $1 } @@ -46,7 +49,7 @@ while test $# -gt 0; do ;; --version) - echo @VERDOT@ + echo $verdot exit 0 ;;