diff options
| author | infirit <[email protected]> | 2013-09-21 08:29:20 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-03 14:21:17 +0200 |
| commit | 65a70b42c20307871a82bee3b92a42caaa6c8abb (patch) | |
| tree | 3d34a7aae42187cec4c1734fff265e2d94930db4 | |
| parent | 08b894ae5dcd858e356be6bd396b05b1cd718f3d (diff) | |
| download | mate-desktop-65a70b42c20307871a82bee3b92a42caaa6c8abb.tar.bz2 mate-desktop-65a70b42c20307871a82bee3b92a42caaa6c8abb.tar.xz | |
Move mate-conf-import to tools dir
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | mate-conf/Makefile.am | 11 | ||||
| -rw-r--r-- | tools/Makefile.am | 15 | ||||
| -rwxr-xr-x | tools/mate-conf-import (renamed from mate-conf/mate-conf-import) | 0 | ||||
| -rw-r--r-- | tools/mate-conf-import.desktop.in.in (renamed from mate-conf/mate-conf-import.desktop.in.in) | 0 |
6 files changed, 14 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index d9cfa80..ddeb2b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,9 +9,6 @@ endif if USER_GUIDE_ENABLED SUBDIRS += user-guide endif -if MATE_CONF_IMPORT_ENABLED -SUBDIRS += mate-conf -endif ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 3fabd9c..0bf2d8e 100644 --- a/configure.ac +++ b/configure.ac @@ -326,8 +326,7 @@ desktop-docs/gpl/Makefile desktop-docs/lgpl/Makefile schemas/Makefile man/Makefile -mate-conf/Makefile -mate-conf/mate-conf-import.desktop.in +tools/mate-conf-import.desktop.in tools/Makefile user-guide/Makefile ]) diff --git a/mate-conf/Makefile.am b/mate-conf/Makefile.am deleted file mode 100644 index 61b1a17..0000000 --- a/mate-conf/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -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/tools/Makefile.am b/tools/Makefile.am index 399fb83..65faf6d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,3 +1,14 @@ -bin_SCRIPTS = mate-gsettings-toggle.sh +bin_SCRIPTS = mate-gsettings-toggle -EXTRA_DIST = $(bin_SCRIPTS) +if MATE_CONF_IMPORT_ENABLED +@INTLTOOL_DESKTOP_RULE@ + +desktopdir = $(datadir)/applications +desktop_in_files = mate-conf-import.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +bin_SCRIPTS += mate-conf-import +endif + +EXTRA_DIST = $(bin_SCRIPTS) + +CLEANFILES = mate-conf-import.desktop diff --git a/mate-conf/mate-conf-import b/tools/mate-conf-import index beb7976..beb7976 100755 --- a/mate-conf/mate-conf-import +++ b/tools/mate-conf-import diff --git a/mate-conf/mate-conf-import.desktop.in.in b/tools/mate-conf-import.desktop.in.in index 97800f1..97800f1 100644 --- a/mate-conf/mate-conf-import.desktop.in.in +++ b/tools/mate-conf-import.desktop.in.in |