summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-05-01 14:22:31 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-05-01 14:22:31 -0400
commitb324fe2d976512b7705beca57ff9a62630cc6c83 (patch)
tree51d083b5e6d7c9b0ee022446a442901bb41ec0e9
parent8ac66bf0d2befdef3b8c96ef147e4e60fa7df0f7 (diff)
Revert "Add docs/ directory back into Makefile"
This reverts commit 8ac66bf0d2befdef3b8c96ef147e4e60fa7df0f7. This broke the build. Probably srcdir != builddir troubles.
-rw-r--r--Makefile.am1
-rw-r--r--docs/Makefile.am18
2 files changed, 8 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 9f6bd2f6..45a8bf0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -194,7 +194,6 @@ 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 51f1e02b..75e9bbf6 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -5,14 +5,13 @@ generated_mans = \
$(NULL)
man1_MANS = $(generated_mans) \
- docs/gnome-keyring-3.1 \
+ gnome-keyring-3.1 \
$(NULL)
MAN_IN_FILES = \
- docs/gnome-keyring-daemon.xml \
- docs/gnome-keyring.xml
+ $(generated_mans:.1=.xml)
-CLEANFILES += \
+CLEANFILES = \
$(generated_mans)
XSLTPROC_FLAGS = \
@@ -29,11 +28,10 @@ XSLTPROC_MAN = \
.xml.1:
$(AM_V_GEN) $(XSLTPROC_MAN) $<
-EXTRA_DIST += \
- docs/file-format.txt \
- docs/keyring-intro.txt \
- docs/gnome-keyring.svg \
- $(generated_mans) \
+EXTRA_DIST = \
+ file-format.txt \
+ keyring-intro.txt \
+ gnome-keyring.svg \
$(MAN_IN_FILES) \
- docs/gnome-keyring-3.1 \
+ gnome-keyring-3.1 \
$(NULL)