diff options
| author | Clement Lefebvre <[email protected]> | 2015-09-18 10:36:01 +0100 |
|---|---|---|
| committer | Clement Lefebvre <[email protected]> | 2015-09-18 10:36:01 +0100 |
| commit | 5ca874a34650d3f9b44dcbd00eb219a9bf04a394 (patch) | |
| tree | b8c4e108e5e65c0df74a8391b7adb5e5b5acc1e7 /Makefile.am | |
| parent | 57886d7a447ed010762879259beb97e81c0284ea (diff) | |
| parent | ca724d9f8493639ef51e108fb0b8bef499207ffa (diff) | |
| download | mate-desktop-5ca874a34650d3f9b44dcbd00eb219a9bf04a394.tar.bz2 mate-desktop-5ca874a34650d3f9b44dcbd00eb219a9bf04a394.tar.xz | |
Merge branch 'master' of https://github.com/clefebvre/mate-desktop into clefebvre-master
Conflicts:
configure.ac
user-guide/mate-user-guide.desktop.in.in
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 5e76c52..79a7504 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,9 +3,6 @@ SUBDIRS = libmate-desktop man docs po schemas tools icons if MATE_ABOUT_ENABLED SUBDIRS += mate-about endif -if USER_GUIDE_ENABLED -SUBDIRS += user-guide -endif ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |