summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBor Kraljič2011-09-05 09:31:00 +0200
committerBor Kraljič2011-09-05 09:31:00 +0200
commit608ee626a160cf5b27874242d77f02425cf6be2e (patch)
tree861a0b481dbc60807d08e090837e4ccbcd66b0e8
parentfa33ff94bb2661ddce3a3d96491570dae6edbac6 (diff)
kde4*/FUNCTIONS: install config files in /etc
-rw-r--r--ChangeLog3
-rwxr-xr-xkde4-apps/FUNCTIONS2
-rwxr-xr-xkde4-bindings/FUNCTIONS2
-rwxr-xr-xkde4-edu/FUNCTIONS2
-rwxr-xr-xkde4-graphics/FUNCTIONS3
-rwxr-xr-xkde4-look/FUNCTIONS2
-rwxr-xr-xkde4/FUNCTIONS2
7 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ec8800013e..cefdfd009a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-09-05 Bor Kraljič <pyrobor@ver.si>
+ * {kde4-apps,kde4-bindings,kde4-edu,kde4-graphics,kde4-look,kde4}/FUNCTIONS: install config files in /etc
+
2011-09-04 Bor Kraljič <pyrobor@ver.si>
* kde4-graphics/FUNCTIONS: /opt/kde4 -> /usr
diff --git a/kde4-apps/FUNCTIONS b/kde4-apps/FUNCTIONS
index 8dc9049424..2ea66b4236 100755
--- a/kde4-apps/FUNCTIONS
+++ b/kde4-apps/FUNCTIONS
@@ -4,6 +4,7 @@ prepare_environment() {
persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
+ KDE4ETC="$INSTALL_ROOT/etc" &&
PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
@@ -18,6 +19,7 @@ default_build() {
cd build &&
cmake -DCMAKE_INSTALL_PREFIX="$KDE4DIR" \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ -DSYSCONF_INSTALL_DIR=$KDE4ETC \
$OPTS ../ &&
make
}
diff --git a/kde4-bindings/FUNCTIONS b/kde4-bindings/FUNCTIONS
index cfbb824f4f..5950dddb01 100755
--- a/kde4-bindings/FUNCTIONS
+++ b/kde4-bindings/FUNCTIONS
@@ -1,6 +1,7 @@
default_build() {
persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
+ KDE4ETC="$INSTALL_ROOT/etc" &&
QTDIR=$INSTALL_ROOT/usr/bin/qt4 &&
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
@@ -12,6 +13,7 @@ default_build() {
CMAKE_PREFIX_PATH=$KDE4DIR &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ -DSYSCONF_INSTALL_DIR=$KDE4ETC \
$OPTS ../ &&
make
}
diff --git a/kde4-edu/FUNCTIONS b/kde4-edu/FUNCTIONS
index 2a74baa086..7a2f092370 100755
--- a/kde4-edu/FUNCTIONS
+++ b/kde4-edu/FUNCTIONS
@@ -1,6 +1,7 @@
default_build() {
persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
+ KDE4ETC="$INSTALL_ROOT/etc" &&
QTDIR=$INSTALL_ROOT/usr/bin/qt4 &&
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
@@ -12,6 +13,7 @@ default_build() {
CMAKE_PREFIX_PATH=$KDE4DIR &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ -DSYSCONF_INSTALL_DIR=$KDE4ETC \
$OPTS ../ &&
make
}
diff --git a/kde4-graphics/FUNCTIONS b/kde4-graphics/FUNCTIONS
index 950b51bade..b96cc7b6ec 100755
--- a/kde4-graphics/FUNCTIONS
+++ b/kde4-graphics/FUNCTIONS
@@ -1,6 +1,7 @@
default_build() {
persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
+ KDE4ETC="$INSTALL_ROOT/etc" &&
QTDIR=$INSTALL_ROOT/usr/bin/qt4 &&
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
@@ -12,6 +13,7 @@ default_build() {
CMAKE_PREFIX_PATH=$KDE4DIR &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ -DSYSCONF_INSTALL_DIR=$KDE4ETC \
$OPTS ../ &&
make
}
@@ -23,6 +25,7 @@ prepare_environment() {
# persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
+ KDE4ETC="$INSTALL_ROOT/etc" &&
PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
diff --git a/kde4-look/FUNCTIONS b/kde4-look/FUNCTIONS
index 1a08d8249b..fa970703a3 100755
--- a/kde4-look/FUNCTIONS
+++ b/kde4-look/FUNCTIONS
@@ -4,6 +4,7 @@ prepare_environment() {
persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
+ KDE4ETC="$INSTALL_ROOT/etc" &&
PATH="$KDE4DIR/bin:$PATH" &&
LD_LIBRARY_PATH="$KDE4DIR/lib:$LD_LIBRARY_PATH" &&
@@ -18,6 +19,7 @@ default_build() {
cd build &&
cmake -DCMAKE_INSTALL_PREFIX="$KDE4DIR" \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ -DSYSCONF_INSTALL_DIR=$KDE4ETC \
../ &&
make
}
diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 7d1aa4dffe..3d1f7a02ff 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -1,6 +1,7 @@
default_build() {
persistent_add KDE4DIR &&
KDE4DIR="$INSTALL_ROOT/usr" &&
+ KDE4ETC="$INSTALL_ROOT/etc" &&
QTDIR=$INSTALL_ROOT/usr/bin/qt4 &&
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
@@ -12,6 +13,7 @@ default_build() {
CMAKE_PREFIX_PATH=$KDE4DIR &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
+ -DSYSCONF_INSTALL_DIR=$KDE4ETC \
$OPTS ../ &&
make
}