From: Kaj-Michael Lang <milang@angel.tal.org>
Date: Mon, 15 Oct 2007 08:40:46 +0000 (+0300)
Subject: Use proper locations for data files for non-hildon case
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5db3502431d9e6e0a02115b1615c2d6c5621d2b;p=mapper

Use proper locations for data files for non-hildon case
---

diff --git a/configure.ac b/configure.ac
index a698460..e778109 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,26 +237,35 @@ if test "x$HAVE_HILDON" = "xyes"; then
  pluginlibdir=`$PKG_CONFIG hildon-control-panel --variable=plugindir`
  plugindesktopentrydir=`$PKG_CONFIG hildon-control-panel --variable=plugindesktopentrydir`
 
+ # Application icon install directories
+ icon_26x26dir=$datadir/icons/hicolor/26x26/hildon
+ icon_34x34dir=$datadir/icons/hicolor/34x34/hildon
+ icon_40x40dir=$datadir/icons/hicolor/40x40/hildon
+ icon_50x50dir=$datadir/icons/hicolor/50x50/hildon
+ icon_scalabledir=$datadir/icons/hicolor/scalable/hildon
+
+ # Help file install directory
+ helpfile_enusdir=$datadir/osso-help/en_US
+ helpfile_engbdir=$datadir/osso-help/en_GB
+
+ AC_SUBST(helpfile_enusdir)
+ AC_SUBST(helpfile_engbdir)
+
 else
- desktopentrydir=
+ desktopentrydir=$datadir/applications
  serviceentrydir=
- pixmapdir=
+ pixmapdir=$datadir/pixmaps
  pluginlibdir=
  plugindesktopentrydir=
-fi
 
-# Application icon install directories
-icon_26x26dir=$datadir/icons/hicolor/26x26/hildon
-icon_34x34dir=$datadir/icons/hicolor/34x34/hildon
-icon_40x40dir=$datadir/icons/hicolor/40x40/hildon
-icon_50x50dir=$datadir/icons/hicolor/50x50/hildon
-icon_scalabledir=$datadir/icons/hicolor/scalable/hildon
+ # Application icon install directories
+ icon_26x26dir=$datadir/icons/hicolor/26x26
+ icon_34x34dir=$datadir/icons/hicolor/34x34
+ icon_40x40dir=$datadir/icons/hicolor/40x40
+ icon_50x50dir=$datadir/icons/hicolor/50x50
+ icon_scalabledir=$datadir/icons/hicolor/scalable
 
-# Help file install directory
-helpfile_enusdir=$datadir/osso-help/en_US
-AC_SUBST(helpfile_enusdir)
-helpfile_engbdir=$datadir/osso-help/en_GB
-AC_SUBST(helpfile_engbdir)
+fi
 
 # Define as variables in Makefiles
 AC_SUBST(desktopentrydir)