New commits:
commit 9c9251c2738b496a090791198e436785e499c7e8
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>
archive/bacula: cleaned up, git version corrected
diff --git a/archive/bacula/BUILD b/archive/bacula/BUILD
index c096cca..89c9a09 100755
--- a/archive/bacula/BUILD
+++ b/archive/bacula/BUILD
@@ -1,12 +1,8 @@
local python_ver=$(installed_version python) &&
OPTS=${OPTS//--with-python/--with-python=\/usr\/include\/python${python_ver:0:3}}
&&
OPTS=${OPTS//sqlite/sqlite3} &&
-./configure \
- --prefix=$INSTALL_ROOT/usr \
- --sysconfdir=$INSTALL_ROOT/etc/bacula \
- --localstatedir=$INSTALL_ROOT/var \
- --mandir=$INSTALL_ROOT/usr/share/man \
- --infodir=$INSTALL_ROOT/usr/share/info \
- $BACULA_CLIENT \
- $OPTS &&
-make
+OPTS="${OPTS} ${BACULA_CLIENT}" &&
+if [ "${BACULA_SCM}" == 'y' ]; then
+ cd bacula
+fi &&
+default_build
diff --git a/archive/bacula/DETAILS b/archive/bacula/DETAILS
index d20f1f1..8ce04a2 100755
--- a/archive/bacula/DETAILS
+++ b/archive/bacula/DETAILS
@@ -1,7 +1,7 @@
SPELL=bacula
-if [ "${BACULA_CVS}" == 'y' ]
+if [ "${BACULA_SCM}" == 'y' ]
then
- if [ "${BACULA_CVS_AUTOUPDATE}" == 'y' ]
+ if [ "${BACULA_SCM_AUTOUPDATE}" == 'y' ]
then
VERSION=$(date +%Y%m%d)
else
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index ccf2f6e..b915260 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,6 +1,7 @@
2009-09-04 Quentin Rameau <quinq AT sourcemage.org>
* DETAILS: updated to version 3.0.2, now use git instead of cvs for
scm
* DEPENDS: made dependency on mtx-tape optional
+ * BUILD: build directory changed for git version
2007-03-21 David Kowis <dkowis AT shlrm.org>
* BUILD: fixed python path, fixed sqlite include
@@ -59,4 +60,3 @@
2005-04-19 Sergey Lipnevich <sergey AT sourcemage.org>
* ALL: created spell
-
diff --git a/archive/bacula/PREPARE b/archive/bacula/PREPARE
index 51ea7fe..d2cf639 100755
--- a/archive/bacula/PREPARE
+++ b/archive/bacula/PREPARE
@@ -1,4 +1,4 @@
-config_query BACULA_CVS 'Build from CVS?' n &&
-if [ "${BACULA_CVS}" == 'y' ]; then
- config_query BACULA_CVS_AUTOUPDATE 'Update on every system update?' n
+config_query BACULA_SCM 'Build scm version ?' n &&
+if [ "${BACULA_SCM}" == 'y' ]; then
+ config_query BACULA_SCM_AUTOUPDATE 'Update on every system update?' n
fi
[SM-Commit] GIT changes to master grimoire by Quentin Rameau (9c9251c2738b496a090791198e436785e499c7e8),
Quentin Rameau, 09/04/2009