diff options
| author | Stef Walter <stefw@gnome.org> | 2014-05-01 16:58:27 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2014-05-01 17:27:28 +0200 |
| commit | 8ac66bf0d2befdef3b8c96ef147e4e60fa7df0f7 (patch) | |
| tree | 02b441890ac133f527f2f44e9026547a320e9fa7 | |
| parent | fba0600503cca64666e90aaccdfe35603631bce3 (diff) | |
Add docs/ directory back into Makefile
https://bugzilla.gnome.org/show_bug.cgi?id=727010
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | docs/Makefile.am | 18 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 45a8bf0e..9f6bd2f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -194,6 +194,7 @@ EXTRA_DIST = \ $(VALGRIND_SUPPRESSIONS) \ $(NULL) +include docs/Makefile.am include egg/Makefile.am include daemon/Makefile.am include daemon/control/Makefile.am diff --git a/docs/Makefile.am b/docs/Makefile.am index 75e9bbf6..51f1e02b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -5,13 +5,14 @@ generated_mans = \ $(NULL) man1_MANS = $(generated_mans) \ - gnome-keyring-3.1 \ + docs/gnome-keyring-3.1 \ $(NULL) MAN_IN_FILES = \ - $(generated_mans:.1=.xml) + docs/gnome-keyring-daemon.xml \ + docs/gnome-keyring.xml -CLEANFILES = \ +CLEANFILES += \ $(generated_mans) XSLTPROC_FLAGS = \ @@ -28,10 +29,11 @@ XSLTPROC_MAN = \ .xml.1: $(AM_V_GEN) $(XSLTPROC_MAN) $< -EXTRA_DIST = \ - file-format.txt \ - keyring-intro.txt \ - gnome-keyring.svg \ +EXTRA_DIST += \ + docs/file-format.txt \ + docs/keyring-intro.txt \ + docs/gnome-keyring.svg \ + $(generated_mans) \ $(MAN_IN_FILES) \ - gnome-keyring-3.1 \ + docs/gnome-keyring-3.1 \ $(NULL) |