Changeset 4469

Timestamp:

07/01/06 23:24:01 (2 years ago)

Author:

erijo

Message:

Install licq.desktop to:

• $datadir/applications if we don't have kde
• $datadir/$(kde-config --install xdgdata-apps) if we have kde >= 3.2
• $datadir/$(kde-config --install apps) if we have kde < 3.2

If someone that actually have kde < 3.2 could try this, it'd be great.

Closes #784.

Location:

trunk/qt-gui

Files:

• acinclude.m4.in (modified) (1 diff)
• configure.in (modified) (1 diff)
• share/Makefile.am (modified) (2 diffs)

trunk/qt-gui/acinclude.m4.in

@@ -376 +376 @@
 ])
 
+AC_DEFUN([AC_PATH_KDE_CONFIG],
+[
+  if test "$have_kde" = "yes"; then
+    AC_PATH_PROG(
+      KDE_CONFIG,
+      kde-config,
+      no,
+      /opt/kde3/bin:/opt/kde2/bin:/opt/kde/bin:/usr/lib/kde/bin:/usr/local/kde/bin/:/usr/kde/bin:/usr/lib/kde/bin:/usr/bin:/usr/X11R6/bin:$PATH)
+
+    if test "$KDE_CONFIG" = "no"; then
+      AC_MSG_ERROR(["Could not find kde-config, make sure it's in your PATH"])
+    fi
+  fi
+
+  AC_SUBST(KDE_CONFIG)
+])
+
 AC_DEFUN([AC_PATH_DCOP],
 [

trunk/qt-gui/configure.in

@@ -145 +145 @@
 AC_PATH_KDE_LIBRARIES
 AC_PATH_DCOP
+AC_PATH_KDE_CONFIG
 LICQ_CHECK_GPGME
 

trunk/qt-gui/share/Makefile.am

@@ -10 +10 @@
 
 install-data-local:
-    @if test "$(KDEDIR)" != ""; then \
-       if test -w "$(KDEDIR)"; then \
-         $(mkinstalldirs) $(DESTDIR)$(KDEDIR)/share/applnk/Internet; \
-         $(INSTALL_DATA) $(srcdir)/licq.desktop \
-                              $(DESTDIR)$(KDEDIR)/share/applnk/Internet; \
-       else \
-         $(mkinstalldirs) $(HOME)/.kde/share/applnk/Internet; \
-         $(INSTALL_DATA) $(srcdir)/licq.desktop $(HOME)/.kde/share/applnk/Internet; \
-       fi  \
+    @if test "$(have_kde)" = "yes"; then \
+        appsdir="`$(KDE_CONFIG) --install xdgdata-apps`"; \
+        if test "$$appsdir" = "NONE"; then \
+            appsdir="`$(KDE_CONFIG) --install apps`/Internet"; \
+        fi; \
+        appsdir=`echo $$appsdir | sed -e 's#$${datadir}#$(datadir)#'`; \
+        $(mkinstalldirs) $(DESTDIR)$$appsdir; \
+        $(INSTALL_DATA) $(srcdir)/licq.desktop $(DESTDIR)$$appsdir; \
+    else \
+        $(mkinstalldirs) $(DESTDIR)$(datadir)/applications; \
+        $(INSTALL_DATA) $(srcdir)/licq.desktop $(DESTDIR)$(datadir)/applications; \
     fi
     $(mkinstalldirs) $(DESTDIR)$(sharedir)
@@ -63 +65 @@
     done
     $(mkinstalldirs) $(DESTDIR)$(sharedir)/qt-gui/emoticons
-    @for j in `echo $(srcdir)/qt-gui/emoticons/*|sed s/"$(srcdir)\/qt-gui\/emoticons\/CVS"//g`; do \
+    @for j in `echo $(srcdir)/qt-gui/emoticons/*|sed s#$(srcdir)/qt-gui/emoticons/CVS##g`; do \
       jj="qt-gui/emoticons/`basename $$j`" ; \
       if test -d $$j; then \