diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | mate-conf/Makefile.am | 11 | ||||
| -rw-r--r-- | mate-conf/mate-conf-import.desktop.in.in | 10 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 |
6 files changed, 35 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c0d5b64..3283061 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,9 @@ endif if DESKTOP_DOCS_ENABLED SUBDIRS += desktop-docs endif +if MATE_CONF_IMPORT_ENABLED +SUBDIRS += mate-conf +endif ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 943b082..8144c54 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,12 @@ AC_ARG_ENABLE([desktop-docs], [],[enable_desktop_docs=yes]) AM_CONDITIONAL(DESKTOP_DOCS_ENABLED, test "x$enable_desktop_docs" = "xyes") +# Install tool to migrate 1.4 MateConf settings +AC_ARG_ENABLE([mate-conf-import], + [AS_HELP_STRING([--disable-mate-conf-import],[dont install mate-conf-import tool])], + [],[enable_mate_conf_import=yes]) +AM_CONDITIONAL(MATE_CONF_IMPORT_ENABLED, test "x$enable_mate_conf_import" = "xyes") + # Path to the pnp.ids file -- to know if we use one shipped with another # package, or an internal file @@ -301,6 +307,8 @@ desktop-docs/gpl/Makefile desktop-docs/lgpl/Makefile schemas/Makefile man/Makefile +mate-conf/Makefile +mate-conf/mate-conf-import.desktop.in ]) AC_OUTPUT @@ -330,6 +338,7 @@ mate-desktop $VERSION `echo mate-desktop $VERSION | sed "s/./=/g"` Build mate-about: ${enable_mate_about} Use libunique: ${enable_libunique} Build desktop-wide docs: ${enable_desktop_docs} + Install mate-conf-import: ${enable_mate_conf_import} Use external pnp.ids: ${EXTERNAL_PNP_IDS} Startup notification support: ${have_startup_notification} XRandr support: ${have_randr} diff --git a/mate-conf/Makefile.am b/mate-conf/Makefile.am new file mode 100644 index 0000000..61b1a17 --- /dev/null +++ b/mate-conf/Makefile.am @@ -0,0 +1,11 @@ +bin_SCRIPTS = mate-conf-import + +@INTLTOOL_DESKTOP_RULE@ + +desktopdir = $(datadir)/applications +desktop_in_files = mate-conf-import.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + +EXTRA_DIST = $(bin_SCRIPTS) + +CLEANFILES = mate-conf-import.desktop diff --git a/mate-conf/mate-conf-import.desktop.in.in b/mate-conf/mate-conf-import.desktop.in.in new file mode 100644 index 0000000..97800f1 --- /dev/null +++ b/mate-conf/mate-conf-import.desktop.in.in @@ -0,0 +1,10 @@ +[Desktop Entry] +_Name=Migrate MATE 1.4 settings +_Comment=Tool to migrate MATE 1.4 settings to MATE 1.6 +Exec=mate-conf-import +Icon=mateconf-editor +Terminal=false +Type=Application +Categories=GTK;Settings;DesktopSettings; +OnlyShowIn=MATE; +StartupNotify=false diff --git a/po/POTFILES.in b/po/POTFILES.in index 0392d82..6d9327d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,6 +3,7 @@ mate-about/mate-about.desktop.in.in mate-about/mate-about.c mate-about/mate-about.h +mate-conf/mate-conf-import.desktop.in.in # When adding a file here, make sure that the entry point in the API of this # file calls _mate_desktop_init_i18n () libmate-desktop/display-name.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 763e366..9ac65bf 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -2,4 +2,5 @@ # translated. # Please keep this file sorted alphabetically. mate-about/mate-about.desktop.in +mate-conf/mate-conf-import.desktop.in mate-version.xml.in |