[X2Go-Dev] x2goclient does not build

[Oliver Burger]

Hi Mike,

Am 29.02.2012 17:06, schrieb Mike Gabriel:
>> Is there a majority of distros calling the tools lrelease-qt4 and
>> qmake-qt4 or is it just Debian and its sibblings?
>
> Please run make && make install on the main Makefile (with your patch).
> The main Makefile handles the qmake calls and also the translation process.

Sorry, I thought it was Mageia specific. In Mageia the qt tools are 
called qmake instead of qmake-qt4 and lrelease instead of lrelease-qt4.

Here is my patch:

----->   snip   <-----
diff -ruN x2goclient_3.99.1.0.orig/config_linux_plugin.sh 
x2goclient_3.99.1.0/config_linux_plugin.sh
--- x2goclient_3.99.1.0.orig/config_linux_plugin.sh     2012-02-22 
14:50:58.000000000 +0100
+++ x2goclient_3.99.1.0/config_linux_plugin.sh  2012-02-29 
09:03:36.394181499 +0100
@@ -2,4 +2,4 @@

  make distclean

-X2GO_CLIENT_TARGET=plugin qmake-qt4
+X2GO_CLIENT_TARGET=plugin qmake
diff -ruN x2goclient_3.99.1.0.orig/config_linux.sh 
x2goclient_3.99.1.0/config_linux.sh
--- x2goclient_3.99.1.0.orig/config_linux.sh    2012-02-22 
14:50:58.000000000 +0100
+++ x2goclient_3.99.1.0/config_linux.sh 2012-02-29 09:03:56.190286552 +0100
@@ -1,4 +1,4 @@
  #!/bin/bash

  make distclean
-qmake-qt4
+qmake
diff -ruN x2goclient_3.99.1.0.orig/Makefile x2goclient_3.99.1.0/Makefile
--- x2goclient_3.99.1.0.orig/Makefile   2012-02-22 14:50:58.000000000 +0100
+++ x2goclient_3.99.1.0/Makefile        2012-02-29 08:58:56.372610802 +0100
@@ -28,13 +28,13 @@
  build: build_client build_plugin build_man

  build_client:
-       lrelease-qt4 x2goclient.pro
-       mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 
../x2goclient.pro
+       lrelease x2goclient.pro
+       mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake 
../x2goclient.pro
         cd $(CLIENT_DIR) && $(MAKE)

  build_plugin:
-       lrelease-qt4 x2goclient.pro
-       mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && 
X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro
+       lrelease x2goclient.pro
+       mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && 
X2GO_CLIENT_TARGET=plugin qmake ../x2goclient.pro
         cd $(PLUGIN_DIR) && $(MAKE)

  build_man:
----->   snip   <-----