From 130c7640ca92ad0a5eab6a8119128eaa05e19894 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Thu, 24 Apr 2014 19:55:23 +0200
Subject: [PATCH 3/3] doc installation fixes
Do not override docdir.
Add missing DESTDIR prefixes.
Avoid extra copy of the man page.
---
doc/Makefile.am | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 82f03c1..5f8d529 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-docdir = ${DESTDIR}$(prefix)/share/sockperf/
+#docdir = ${DESTDIR}$(prefix)/share/sockperf/
docfiles = \
$(top_srcdir)/readme \
$(top_srcdir)/authors \
@@ -20,13 +20,13 @@ doxygen: Doxyfile main.dox
( cat Doxyfile ; echo "PROJECT_NUMBER=`cat ../version`" ) | doxygen -
install-data-local:
- $(mkinstalldirs) $(docdir)
+ $(mkinstalldirs) ${DESTDIR}$(docdir)
cp -rf man/man/ ${DESTDIR}$(prefix)/share/
- cp -rf man/* $(docdir)
- cp -rf ${docfiles} $(docdir)
+ cp -rf man/html/ ${DESTDIR}$(docdir)
+ cp -rf ${docfiles} ${DESTDIR}$(docdir)
uninstall-local:
- $(RM) -rf $(docdir)/*
+ $(RM) -rf ${DESTDIR}$(docdir)/*
clean-local:
$(RM) -r man doxygen.log
--
1.9.0