org.handhelds.familiar/packages/maemo/osso-application-installer/fix-buildsystem.patch

   1 diff -urbB osso-application-installer-1.0.03_old/configure.ac osso-application-installer-1.0.03/configure.ac
   2 --- osso-application-installer-1.0.03_old/configure.ac  2005-05-22 22:06:52.000000000 +0200
   3 +++ osso-application-installer-1.0.03/configure.ac      2005-06-30 12:19:24.000000000 +0200
   4 @@ -38,9 +38,9 @@
   5  AC_SUBST(CP_CFLAGS)
   6  AC_SUBST(CP_LIBS)
   7
   8 -cp_pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir`
   9 +cp_pluginlibdir=${libdir}/hildon-control-panel
  10  AC_SUBST(cp_pluginlibdir)
  11 -cp_plugindesktopdir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir`
  12 +cp_plugindesktopdir=${datadir}/applications/hildon-control-panel
  13  AC_SUBST(cp_plugindesktopdir)
  14
  15  # Localisation-related
  16 @@ -52,12 +52,12 @@
  17  AM_GLIB_GNU_GETTEXT
  18
  19  # Mime crap
  20 -dnl MIME-type registration check (2.6 / 2.8 version)
  21 -AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
  22 -AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno)
  23 +#dnl MIME-type registration check (2.6 / 2.8 version)
  24 +#AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
  25 +#AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno)
  26
  27 -AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
  28 -AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
  29 +#AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
  30 +#AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
  31
  32
  33  applicationinstallerlocaledir=${datadir}/locale
  34 @@ -76,7 +76,7 @@
  35  AC_SUBST(hildonpixmapdir)
  36  AC_SUBST(hildonstatusbarlibdir)
  37
  38 -dbuslibpathdir=`$PKG_CONFIG --variable=libdir dbus-1`
  39 +dbuslibpathdir=${libdir}
  40  dbusconfdir=/etc/dbus-1/system.d
  41  dbusservdir=${dbuslibpathdir}/dbus-1.0/services
  42  AC_SUBST(dbuslibpathdir)
  43 diff -urbB osso-application-installer-1.0.03_old/mime/Makefile.am osso-application-installer-1.0.03/mime/Makefile.am
  44 --- osso-application-installer-1.0.03_old/mime/Makefile.am      2005-05-22 22:06:52.000000000 +0200
  45 +++ osso-application-installer-1.0.03/mime/Makefile.am  2005-06-30 12:19:24.000000000 +0200
  46 @@ -2,19 +2,3 @@
  47  mime_DATA = osso-application-installer.xml
  48
  49  EXTRA_DIST = $(mime_DATA)
  50 -
  51 -install-data-hook:
  52 -if HAVE_26_MIME
  53 -       $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
  54 -endif
  55 -if HAVE_28_MIME
  56 -       $(UPDATE_DESKTOP_DATABASE)
  57 -endif
  58 -
  59 -uninstall-hook:
  60 -if HAVE_26_MIME
  61 -       $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
  62 -endif
  63 -if HAVE_28_MIME
  64 -       $(UPDATE_DESKTOP_DATABASE)
  65 -endif