[mathicgb] 193/393: Fixed recent error in make-Makefile that would link up the built executable to a wrong installed directory. Also fixed GCC compile warning.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit b80ae33c06e46c7d2a36c706c28a9d65a1cd13bc
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Wed Mar 20 21:28:11 2013 +0100

    Fixed recent error in make-Makefile that would link up the built executable to a wrong installed directory. Also fixed GCC compile warning.
---
 build/setup/make-Makefile.sh        | 2 +-
 src/mathicgb/F4MatrixProjection.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/setup/make-Makefile.sh b/build/setup/make-Makefile.sh
index ed418de..de2f2f6 100755
--- a/build/setup/make-Makefile.sh
+++ b/build/setup/make-Makefile.sh
@@ -155,7 +155,6 @@ function makeTarget {
   targetLDFLAGS="${targetsLDFLAGS[targetIndex]}";
   targetMakeArgs="${targetsMakeArgs[targetIndex]}";
   targetDefault="${targetsDefault[targetIndex]}";
-  projectConfigureArgs="--prefix=\"$prefix\" \${${projectName}_conf}";
 
   dependencies="";
   for depProject in $projectDependencies; do
@@ -165,6 +164,7 @@ function makeTarget {
   name="$projectName$targetName"
   targetDir="$projectName/$targetName";
   prefix="\${PWD}/installed/$targetName";
+  projectConfigureArgs="--prefix=\"$prefix\" \${${projectName}_conf}";
 
   echo "$name: ${projectName}BasicSetup $dependencies"
   echo $'\t'"rm -rf \"$targetDir\""
diff --git a/src/mathicgb/F4MatrixProjection.cpp b/src/mathicgb/F4MatrixProjection.cpp
old mode 100644
new mode 100755
index 4eb1377..80b22ab
--- a/src/mathicgb/F4MatrixProjection.cpp
+++ b/src/mathicgb/F4MatrixProjection.cpp
@@ -93,7 +93,7 @@ public:
     };
     std::for_each(mTopRows.begin(), mTopRows.end(), check);
     std::for_each(mBottomRows.begin(), mBottomRows.end(), check);
-#endif MATHICGB_DEBUG
+#endif
     return true;
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git