summaryrefslogtreecommitdiffstats
path: root/FUNCTIONS
diff options
context:
space:
mode:
authorJaka Kranjc2007-11-13 12:36:20 +0000
committerJaka Kranjc2007-11-13 18:33:23 +0000
commit585cceb713e18cc975d9aa6b1c97ce505f1b2d6c (patch)
tree380af2c5379d04a04349317f23e72ff142936345 /FUNCTIONS
parentce4a531638bf7561b05791ca25d3961a939d2565 (diff)
FUNCTIONS: fixed indentation
Diffstat (limited to 'FUNCTIONS')
-rwxr-xr-xFUNCTIONS32
1 files changed, 14 insertions, 18 deletions
diff --git a/FUNCTIONS b/FUNCTIONS
index 6c73d4ac1c..15e12c3d36 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -465,9 +465,9 @@ function check_if_xorg_modular_server()
# CALL THIS BEFORE YOU DO THE INSTALLING. You can see the postfix spell for an example.
declare -f note_config_files &>/dev/null ||
function note_config_files() {
-if check_if_modified "$1"; then
- mark_file_modified "$1"
-fi
+ if check_if_modified "$1"; then
+ mark_file_modified "$1"
+ fi
}
# Functions for default_build and default_install for waf based build systems
@@ -476,36 +476,33 @@ fi
# and waf is fast without it as well
function waf_build(){
-./waf configure \
+ ./waf configure \
--nocache \
--prefix=${INSTALL_ROOT}/usr \
$OPTS &&
-./waf build
+ ./waf build
}
function waf_install(){
-./waf install
+ ./waf install
}
# spells in several sections now need cmake or qt4
-#
cmake_build() {
-cd $SOURCE_DIRECTORY &&
-mkdir -p build &&
-cd build &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
-make
+ cd $SOURCE_DIRECTORY &&
+ mkdir -p build &&
+ cd build &&
+ cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
+ make
}
qt4_build() {
-QTDIR=/usr
-PATH=$QTDIR/bin/qt4:$PATH
-cmake_build
+ QTDIR=/usr
+ PATH=$QTDIR/bin/qt4:$PATH
+ cmake_build
}
-
# check whether the QT provider is qt4
-
function check_if_qt4_provider()
{
if [[ "$(get_spell_provider ${1:-$SPELL} QT)" == "qt4" ]]
@@ -516,7 +513,6 @@ function check_if_qt4_provider()
}
-
# build using qt3 or qt4
# some spells an adapt the build process to either qt3 or qt4
function build_qt3_or_4()