[med-svn] [lamarc] 01/07: Fix install location of docs

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository lamarc.

commit fe57504e7e7c9c83304a7359cc4d683c0a92ddb6
Author: Andreas Tille <tille at debian.org>
Date:   Tue Dec 5 10:03:02 2017 +0100

    Fix install location of docs
---
 debian/patches/fix_install_target.patch        | 12 +++++++++++-
 debian/patches/use_debian_packaged_boost.patch |  6 +++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/patches/fix_install_target.patch b/debian/patches/fix_install_target.patch
index b61c8df..b563b59 100644
--- a/debian/patches/fix_install_target.patch
+++ b/debian/patches/fix_install_target.patch
@@ -1,9 +1,19 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Fri, 01 Dec 2017 19:42:59 +0100
-Description: Drop duplicate from list of files to install
+Description: Drop duplicate from list of files to install,
+ Fix install location
 
 --- a/Makefile.am
 +++ b/Makefile.am
+@@ -1005,7 +1005,7 @@ lamarc.app:     lamarc
+ ## html documentation
+ ## ############################################################
+ 
+-htmldir = $(prefix)/html/lamarc
++htmldir = $(prefix)/share/doc/lamarc/html
+ 
+ html_DATA = \
+ 			doc/html/bayes.html \
 @@ -1026,7 +1026,6 @@ html_DATA = \
  			doc/html/genotype.html \
  			doc/html/glossary.html \
diff --git a/debian/patches/use_debian_packaged_boost.patch b/debian/patches/use_debian_packaged_boost.patch
index a0f829c..e7de208 100644
--- a/debian/patches/use_debian_packaged_boost.patch
+++ b/debian/patches/use_debian_packaged_boost.patch
@@ -13,7 +13,7 @@ Description: Use Debian packaged boost
  			-I $(top_srcdir)/resources
  
  
-@@ -1144,7 +1144,6 @@ htmltrait_DATA  = \
+@@ -1146,7 +1146,6 @@ htmltrait_DATA  = \
  
  license_info = \
  			COPYING \
@@ -21,7 +21,7 @@ Description: Use Debian packaged boost
  			doc/licenses/gpl.txt \
  			doc/licenses/lamarc.txt \
  			doc/licenses/lgpl.txt \
-@@ -1165,7 +1164,6 @@ wx_stuff        = \
+@@ -1167,7 +1166,6 @@ wx_stuff        = \
  EXTRA_DIST                      = \
  			Makefile.am \
  			configure.ac \
@@ -29,7 +29,7 @@ Description: Use Debian packaged boost
  			$(license_info) \
  			$(wx_curr) \
  			$(scripts_to_dist) \
-@@ -1190,7 +1188,7 @@ EXTRA_DIST                      = \
+@@ -1192,7 +1190,7 @@ EXTRA_DIST                      = \
  #                       $(vcprojdir)/lamarc.vcproj
  
  dist-hook:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/lamarc.git