diff options
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/vmchooser/vmchooser.build | 16 | ||||
| -rw-r--r-- | remote/modules/vmchooser/vmchooser.conf | 2 | ||||
| -rw-r--r-- | remote/modules/xorg/data/usr/share/xsessions/gnome.desktop | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build index 340b1d9a..facd8c54 100644 --- a/remote/modules/vmchooser/vmchooser.build +++ b/remote/modules/vmchooser/vmchooser.build @@ -5,11 +5,17 @@ fetch_source() { } build() { - cd src - pinfo "Running vmchooser buildscript" - . build.sh - pinfo "" - cd - &> /dev/null + +SRCDIR="${MODULE_DIR}/src/" + +[ ! -d "${MODULE_BUILD_DIR}/${PREFIX}" ] && mkdir -p "${MODULE_BUILD_DIR}/${PREFIX}" +cd "${MODULE_BUILD_DIR}/${PREFIX}" + +pinfo "Running make" +cmake $CMAKE_ARGS $SRCDIR && make + +cd - &> /dev/null + } post_copy() { diff --git a/remote/modules/vmchooser/vmchooser.conf b/remote/modules/vmchooser/vmchooser.conf index 4054d59b..1e41bc6e 100644 --- a/remote/modules/vmchooser/vmchooser.conf +++ b/remote/modules/vmchooser/vmchooser.conf @@ -1,5 +1,5 @@ GIT=git://git.openslx.org/openslx/tools/vmchooser.git REQUIRED_DEPENDENCIES=" cmake libqt4-dev" -TARGET_DIR="opt/openslx/vmchooser/bin" +PREFIX="/opt/openslx/vmchooser/bin" REQUIRED_BINARIES="vmchooser" diff --git a/remote/modules/xorg/data/usr/share/xsessions/gnome.desktop b/remote/modules/xorg/data/usr/share/xsessions/gnome.desktop deleted file mode 100644 index cdc66661..00000000 --- a/remote/modules/xorg/data/usr/share/xsessions/gnome.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -X-SuSE-translate=true -Encoding=UTF-8 -Type=XSession -Exec=gnome-session -#TryExec=gnome-session -Name=GNOME -Comment=The GNU Network Object Model Environment. A complete, free and easy-to-use desktop environment - |