projects / packages / gnome-control-center.git / blame
| Commit | Line | Data |
|---|---|---|
| a1824854 SS |
1 | diff -aurN gnome-control-center-2.28.0.orig/configure.in gnome-control-center-2.28.0/configure.in |
| 2 | --- gnome-control-center-2.28.0.orig/configure.in 2009-09-24 11:34:15.000000000 +0200 | |
| 3 | +++ gnome-control-center-2.28.0/configure.in 2009-09-24 11:38:03.000000000 +0200 | |
| 4 | @@ -298,6 +298,17 @@ | |
| 5 | enable_update_mimedb=yes) | |
| 6 | AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) | |
| 7 | ||
| 8 | +dnl ======================================= | |
| 9 | +dnl Update Desktop Database | |
| 10 | +dnl ======================================= | |
| 11 | + | |
| 12 | +AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) | |
| 13 | + | |
| 14 | +AC_ARG_ENABLE(update-desktop, | |
| 15 | + AC_HELP_STRING([--disable-update-desktop], | |
| 16 | + [do not update desktop database after installation]),, | |
| 17 | + enable_update_desktop=yes) | |
| 18 | +AM_CONDITIONAL(ENABLE_UPDATE_DESKTOP, test x$enable_update_desktop = xyes) | |
| 19 | ||
| 20 | AC_CONFIG_FILES([ | |
| 21 | Makefile | |
| 22 | diff -aurN gnome-control-center-2.28.0.orig/font-viewer/Makefile.am gnome-control-center-2.28.0/font-viewer/Makefile.am | |
| 23 | --- gnome-control-center-2.28.0.orig/font-viewer/Makefile.am 2009-09-24 11:34:15.000000000 +0200 | |
| 24 | +++ gnome-control-center-2.28.0/font-viewer/Makefile.am 2009-09-24 11:41:45.000000000 +0200 | |
| 25 | @@ -28,11 +28,15 @@ | |
| 26 | install-gconf-schemas: | |
| 27 | endif | |
| 28 | ||
| 29 | +if ENABLE_UPDATE_DESKTOP | |
| 30 | install-desktop-database: install-desktopDATA | |
| 31 | - update-desktop-database $(DESTDIR)$(desktopdir) | |
| 32 | + $(UPDATE_DESKTOP_DATABASE) $(DESTDIR)$(desktopdir) | |
| 33 | ||
| 34 | uninstall-local: | |
| 35 | rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache | |
| 36 | +else | |
| 37 | +install-desktop-database: | |
| 38 | +endif | |
| 39 | ||
| 40 | @INTLTOOL_DESKTOP_RULE@ | |
| 41 | @INTLTOOL_DIRECTORY_RULE@ | |
| 42 | diff -aurN gnome-control-center-2.28.0.orig/Makefile.am gnome-control-center-2.28.0/Makefile.am | |
| 43 | --- gnome-control-center-2.28.0.orig/Makefile.am 2009-09-24 11:34:15.000000000 +0200 | |
| 44 | +++ gnome-control-center-2.28.0/Makefile.am 2009-09-24 11:36:11.000000000 +0200 | |
| 45 | @@ -46,7 +46,7 @@ | |
| 46 | MAINTAINERS \ | |
| 47 | gnome-doc-utils.make | |
| 48 | ||
| 49 | -DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb | |
| 50 | +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --disable-update-desktop | |
| 51 | ||
| 52 | GITIGNOREFILES=m4 | |
| 53 |