* Makefile.am: Add doc in SUBDIRS. * doc/Makefile.am: Fix install/uninstall rules. --- scribo/ChangeLog | 8 ++++++++ scribo/Makefile.am | 2 +- scribo/doc/Makefile.am | 15 ++++++++++----- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index df9d036..1470f32 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2012-02-01 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix scribo doc (un)installation. + + * Makefile.am: Add doc in SUBDIRS. + + * doc/Makefile.am: Fix install/uninstall rules. + 2011-12-12 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * scribo/subsampling/integral_single_image.hh: Fix forward diff --git a/scribo/Makefile.am b/scribo/Makefile.am index b9a590a..cf8a4c6 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -SUBDIRS = demo tests src +SUBDIRS = demo doc tests src .PHONY: bin diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index f1fae6c..6469ab9 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -223,11 +223,16 @@ maintainer-clean-local: # .../srcdoc", which installs our dir into the previous one, instead # of replacing it. install-data-local: - $(mkdir_p) $(DESTDIR)$(htmldir) + $(mkdir_p) $(DESTDIR)$(htmldir)/$(USER_REFMAN) # The user reference manual is located in a subdirectory, hence this # special case. - rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) - cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo + cp -r $(srcdir)/$(USER_REFMAN)/html \ + $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo +# Update paths to milena documentation directory + $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo/installdox \ + -l milena.tag@$(DESTDIR)$(htmldir)/$(USER_REFMAN)/milena \ + `find $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo/ -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/$$d; \ @@ -246,5 +251,5 @@ uninstall-local: done # Same remark as above regarding the special case of the user # reference manual. - chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN) - rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN) + chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN)/scribo -- 1.7.2.5