[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (ee7fd9a10dd073311f7b1d985758724d071cd58b)

Pol Vinogradov scm at sourcemage.org
Tue Jul 31 20:09:24 EDT 2007


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 cluster/ocfs2-tools/BUILD   |   18 ++++++++++--------
 cluster/ocfs2-tools/DETAILS |    4 ++--
 cluster/ocfs2-tools/HISTORY |    5 +++++
 3 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit ee7fd9a10dd073311f7b1d985758724d071cd58b
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    cluster/ocfs2-tools:
    
    DETAILS: updated to 1.2.6
    BUILD: rewritten because some makefiles use ${OPTS},
    removed make_{single,normal}, added infodir and mandir to ./configure

diff --git a/cluster/ocfs2-tools/BUILD b/cluster/ocfs2-tools/BUILD
index 08951b7..3360a96 100755
--- a/cluster/ocfs2-tools/BUILD
+++ b/cluster/ocfs2-tools/BUILD
@@ -1,20 +1,22 @@
+local MY_OPTS="--enable-dynamic-ctl --enable-dynamic-fsck ${OPTS}"  &&
+
+unset OPTS                                        &&
+
 if  [  "$OCFS2_CONSOLE"  ==  "y"  ];  then
-  OPTS="--enable-ocfs2console=yes ${OPTS}"
+  MY_OPTS="--enable-ocfs2console=yes ${MY_OPTS}"
 else
-  OPTS="--enable-ocfs2console=no --disable-glibtest ${OPTS}"
+  MY_OPTS="--enable-ocfs2console=no --disable-glibtest ${MY_OPTS}"
 fi  &&
 
-make_single                                       &&
-
 ./configure  --build=$BUILD                       \
              --prefix=${INSTALL_ROOT}/usr         \
+             --infodir=${INSTALL_ROOT}/usr/share/info  \
+             --mandir=${INSTALL_ROOT}/usr/share/man  \
              --sbindir=${INSTALL_ROOT}/sbin       \
              --sysconfdir=${INSTALL_ROOT}/etc     \
              --localstatedir=${INSTALL_ROOT}/var  \
              --enable-dynamic-ctl                 \
              --enable-dynamic-fsck                \
-             $OPTS                                &&
-
-make                                              &&
+             $MY_OPTS                             &&
 
-make_normal
+make
diff --git a/cluster/ocfs2-tools/DETAILS b/cluster/ocfs2-tools/DETAILS
index e867cc7..573d038 100755
--- a/cluster/ocfs2-tools/DETAILS
+++ b/cluster/ocfs2-tools/DETAILS
@@ -1,8 +1,8 @@
            SPELL=ocfs2-tools
-         VERSION=1.2.1
+         VERSION=1.2.6
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=http://oss.oracle.com/projects/${SPELL}/dist/files/source/v1.2/${SOURCE}
-     SOURCE_HASH=sha512:6366124c3f454e70525fead7973548d6afe1cc1a98faffdd30a7d1886ec5b7247a0b57efa375a2a62f3c4b9d1ff54d607b295df26b94dfdb5fac5a6400fade59
+     SOURCE_HASH=sha512:51b9e9820c4a82a1ee4f785fe7a19cfce271dbfa5587bca8cac752c9a60b41520fa72f50b50bb4ae08ee8f8132176d622a2f780b344b78f4e4438a33e765a096
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://oss.oracle.com/projects/${SPELL}
          ENTERED=20060711
diff --git a/cluster/ocfs2-tools/HISTORY b/cluster/ocfs2-tools/HISTORY
index 63ae752..da72696 100644
--- a/cluster/ocfs2-tools/HISTORY
+++ b/cluster/ocfs2-tools/HISTORY
@@ -1,3 +1,8 @@
+2007-08-01 Pol Vinogradov <vin.public at gmail.com>
+	* DETAILS: updated to 1.2.6
+	* BUILD: rewritten because some makefiles use ${OPTS},
+	  removed make_{single,normal}, added infodir and mandir to ./configure
+
 2006-07-12 Pol Vinogradov <vin.public at gmail.com>
 	* DEPENDS: added vte depends for GUI frontend
 



More information about the SM-Commit mailing list