[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[469]

[<dom...@us...>]

Revision: 469
          http://sourceforge.net/p/fvwm-crystal/code/469
Author:   dominique_libre
Date:     2013-05-25 12:58:32 +0000 (Sat, 25 May 2013)
Log Message:
-----------
make it work with the new asciidoc documentation

Modified Paths:
--------------
    ChangeLog
    Makefile

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-05-25 12:44:11 UTC (rev 468)
+++ ChangeLog	2013-05-25 12:58:32 UTC (rev 469)
@@ -18,7 +18,8 @@
   Mouse Bindings & Tips.txt: removed txt documentation
 + html/*: autogenerated html documentation
   man/*: auto updated the man pages
-
+  Makefile: make it work with the new asciidoc documentation
+  
 Vendredi 23 Mai 2013 Dominique Michel
   functions/FvwmExpose: silent xwd
   apps/Thunar: add preliminary preference support for the action 1 and 2

Modified: Makefile
===================================================================
--- Makefile	2013-05-25 12:44:11 UTC (rev 468)
+++ Makefile	2013-05-25 12:58:32 UTC (rev 469)
@@ -2,10 +2,10 @@
 .PHONY: all install uninstall dist correctpermissions install-doc uninstall-doc
 
 prefix?=/usr/local
-docdir?=$(prefix)/share/doc/fvwm-crystal/
 addondir?=$(prefix)/share/fvwm-crystal/addons
 
 RELEASE=`grep Version fvwm/components/functions/About | sed -e 's/\*About: Text "\$$\[gt\.Version\]: \([0-9.]\+\)"/\1/'`
+docdir?=$(prefix)/share/doc/fvwm-crystal-$(RELEASE)
 
 all:
 	@echo "There is nothing to compile."
@@ -211,7 +211,7 @@
 	-rm -rf $(DESTDIR)$(addondir)
 
 install-doc:
-	mkdir -p $(DESTDIR)$(addondir) $(DESTDIR)$(docdir)
+	mkdir -p $(DESTDIR)$(addondir) $(DESTDIR)$(docdir)/html
 	install -m 644 addons/* $(DESTDIR)$(addondir)
 	install -m 644 AUTHORS Contribute COPYING NEWS ChangeLog Export.README README INSTALL $(DESTDIR)$(docdir)
-	install -m 644 doc/* $(DESTDIR)$(docdir)
+	cp -d -r doc/* $(DESTDIR)$(docdir)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.