diff --git a/Make/makedefs b/Make/makedefs index 130c368d1..b4ad3d35d 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -53,7 +53,7 @@ MAKEDEPEND = ignore VERSION_MAJOR = 0 VERSION_MINOR = 9 VERSION_RELEASE = 8 -VERSION_REVISION ?= 0 +VERSION_REVISION ?= 2 ifneq (,$(OSG_VERSION_REVISION)) VERSION_REVISION = $(OSG_VERSION_REVISION) endif diff --git a/Make/makerpms b/Make/makerpms index c75df5ed6..2d791db25 100644 --- a/Make/makerpms +++ b/Make/makerpms @@ -169,6 +169,9 @@ make_osg_dev() mv /usr/src/redhat/RPMS/i386/OpenSceneGraph_dev-$REV-$REL.i386.rpm dist/RPM } +echo "The current $0 script is broken and needs to be updated." +exit 1 + if [ "`whoami`" != "root" ] then echo @@ -197,7 +200,7 @@ shift;shift; shift;shift; shift;shift; shift;shift; INST_DOC=$1 INST_DATA=$2 -REV="`make version`" +REV="`make -s version`" [ -z "$REV" ] && die "makerpm: requires a functional $TOPDIR/bin/osgversion" REL=1