diff options
| author | Scott Balneaves <[email protected]> | 2013-05-17 14:06:35 -0500 |
|---|---|---|
| committer | Scott Balneaves <[email protected]> | 2013-05-17 14:06:35 -0500 |
| commit | 7318946f007404ed8b44cc030358c3d278d1b8cf (patch) | |
| tree | d26fa4f8316320ac86a80087d8fa602cbcecb0df | |
| parent | 749fe7090053afe610914aee368028bce06fd666 (diff) | |
| parent | 861e3d658f2942a8ec72700fd1935ee5743d34a1 (diff) | |
| download | marco-7318946f007404ed8b44cc030358c3d278d1b8cf.tar.bz2 marco-7318946f007404ed8b44cc030358c3d278d1b8cf.tar.xz | |
Merge branch 'master' of github.com:mate-desktop/mate-window-manager
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 725c69c9..0fd41996 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS=src po doc -EXTRA_DIST = HACKING MAINTAINERS rationales.txt \ +EXTRA_DIST = HACKING rationales.txt \ intltool-extract.in intltool-merge.in intltool-update.in DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache diff --git a/configure.ac b/configure.ac index c44cb485..ff4d3bb9 100644 --- a/configure.ac +++ b/configure.ac @@ -8,12 +8,12 @@ m4_define([marco_micro_version], [1]) m4_define([marco_version], [marco_major_version.marco_minor_version.marco_micro_version]) -AC_INIT([marco], [marco_version], [https://github.com/mate-desktop/mate-desktop-environment]) +AC_INIT([mate-window-manager], [marco_version], [https://github.com/mate-desktop/mate-desktop-environment]) AC_CONFIG_SRCDIR(src/core/display.c) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([no-dist-gzip dist-xz]) AM_MAINTAINER_MODE # Honor aclocal flags diff --git a/src/Makefile.am b/src/Makefile.am index b3019024..a7b01237 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -190,7 +190,8 @@ CLEANFILES = \ marco.desktop \ marco-wm.desktop \ 50-marco-desktop-key.xml \ - 50-marco-key.xml + 50-marco-global-key.xml \ + 50-marco-window-key.xml pkgconfigdir = $(libdir)/pkgconfig |