diff -urbB osso-application-installer-1.0.03_old/configure.ac osso-application-installer-1.0.03/configure.ac --- osso-application-installer-1.0.03_old/configure.ac 2005-05-22 22:06:52.000000000 +0200 +++ osso-application-installer-1.0.03/configure.ac 2005-06-30 12:19:24.000000000 +0200 @@ -38,9 +38,9 @@ AC_SUBST(CP_CFLAGS) AC_SUBST(CP_LIBS) -cp_pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir` +cp_pluginlibdir=${libdir}/hildon-control-panel AC_SUBST(cp_pluginlibdir) -cp_plugindesktopdir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir` +cp_plugindesktopdir=${datadir}/applications/hildon-control-panel AC_SUBST(cp_plugindesktopdir) # Localisation-related @@ -52,12 +52,12 @@ AM_GLIB_GNU_GETTEXT # Mime crap -dnl MIME-type registration check (2.6 / 2.8 version) -AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) -AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) +#dnl MIME-type registration check (2.6 / 2.8 version) +#AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) +#AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno) -AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) -AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) +#AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) +#AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) applicationinstallerlocaledir=${datadir}/locale @@ -76,7 +76,7 @@ AC_SUBST(hildonpixmapdir) AC_SUBST(hildonstatusbarlibdir) -dbuslibpathdir=`$PKG_CONFIG --variable=libdir dbus-1` +dbuslibpathdir=${libdir} dbusconfdir=/etc/dbus-1/system.d dbusservdir=${dbuslibpathdir}/dbus-1.0/services AC_SUBST(dbuslibpathdir) diff -urbB osso-application-installer-1.0.03_old/mime/Makefile.am osso-application-installer-1.0.03/mime/Makefile.am --- osso-application-installer-1.0.03_old/mime/Makefile.am 2005-05-22 22:06:52.000000000 +0200 +++ osso-application-installer-1.0.03/mime/Makefile.am 2005-06-30 12:19:24.000000000 +0200 @@ -2,19 +2,3 @@ mime_DATA = osso-application-installer.xml EXTRA_DIST = $(mime_DATA) - -install-data-hook: -if HAVE_26_MIME - $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" -endif -if HAVE_28_MIME - $(UPDATE_DESKTOP_DATABASE) -endif - -uninstall-hook: -if HAVE_26_MIME - $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" -endif -if HAVE_28_MIME - $(UPDATE_DESKTOP_DATABASE) -endif