diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/maemo/osso-application-installer/fix-buildsystem.patch | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/maemo/osso-application-installer/fix-buildsystem.patch')
| -rw-r--r-- | recipes/maemo/osso-application-installer/fix-buildsystem.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/recipes/maemo/osso-application-installer/fix-buildsystem.patch b/recipes/maemo/osso-application-installer/fix-buildsystem.patch new file mode 100644 index 0000000000..d89522bbb5 --- /dev/null +++ b/recipes/maemo/osso-application-installer/fix-buildsystem.patch @@ -0,0 +1,65 @@ +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 |