[cap4-devel] [SCM] cap4 branch master updated. 1996f19a6628e5d2c5d84d6882aa502aa2d923ac

[Christopher D. M. <cas...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "cap4".

The branch, master has been updated
       via  1996f19a6628e5d2c5d84d6882aa502aa2d923ac (commit)
      from  ee8eddbbf5188ca60541b01fa7e396d90273720a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1996f19a6628e5d2c5d84d6882aa502aa2d923ac
Author: CDM <cas...@us...>
Date:   Fri Feb 24 17:00:24 2012 -0700

    CDM: more testin fixes, still not there

-----------------------------------------------------------------------

Summary of changes:
 Makefile      |    2 +-
 build-cap4.sh |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9871967..6afe450 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,6 @@ svndist: svntgz
 tgz rpm srpm deb: build-cap4.sh
 	export CAP4DEVHOME=`pwd`; ./build-cap4.sh official $@
 
-gittgz svntgz svnrpm svnsrpm svndeb: build-cap4.sh
+gittgz svntgz gitrpm svnrpm gitsrpm svnsrpm gitdeb svndeb: build-cap4.sh
 	export CAP4DEVHOME=`pwd` && ./build-cap4.sh snapshot $(shell echo $@ | sed -e 's/svn//g' -e 's/git//g')
 
diff --git a/build-cap4.sh b/build-cap4.sh
index d703cd3..29d7fc6 100755
--- a/build-cap4.sh
+++ b/build-cap4.sh
@@ -47,7 +47,7 @@ VERSION=$(grep ^Version: $CAP4DEVHOME/cap.spec | awk '{print $2}')
 #
 git_version() {
    GITVERSION=`git describe --always`
-   GITMODIFIED=`(git status | grep "modified:\|added:\|deleted:" -q) && echo "-M"`
+   GITMODIFIED=`(git status | grep "modified:\|added:\|deleted:" -q) && echo "_M"`
    RELEASE=$GITVERSION$GITMODIFIED
 }
 svnversion() {
@@ -125,7 +125,6 @@ elif [ $PKG = deb ]; then
 	fi
 	mkdir -p /tmp/cap4-debian
 	cd ${SOURCE_BUILD_ROOT}
-	prefix=/tmp/cap4-debian make install
 	cp -r debian/DEBIAN /tmp/cap4-debian
 	sed ${REL_SEDCMD} $CAP4DEVHOME/debian/DEBIAN/control > /tmp/cap4-debian/DEBIAN/control
 	cd /tmp


hooks/post-receive
-- 
cap4