[Libwpg-cvs] libwpg/docs/doxygen Makefile.am,1.1,1.2

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpg/libwpg/docs/doxygen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29077/docs/doxygen

Modified Files:
	Makefile.am 
Log Message:
Allow specifying the docdir and don't install documentation as executables (patch Michal Marek mm...@su...) + gcc 4.3 fixes

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libwpg/libwpg/docs/doxygen/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	20 Apr 2007 09:43:35 -0000	1.1
+++ Makefile.am	8 Apr 2008 12:12:43 -0000	1.2
@@ -5,13 +5,13 @@
 if WITH_LIBWPG_DOCS
 
 install-data-am:
-	mkdir -p $(DESTDIR)$(datadir)/doc/libwpg-@WPG_VERSION@/html
-	$(INSTALL) html/*.html $(DESTDIR)$(datadir)/doc/libwpg-@WPG_VERSION@/html/
-	$(INSTALL) html/*.png $(DESTDIR)$(datadir)/doc/libwpg-@WPG_VERSION@/html/
-	$(INSTALL) html/*.css $(DESTDIR)$(datadir)/doc/libwpg-@WPG_VERSION@/html/
+	mkdir -p $(DESTDIR)$(docdir)/html
+	$(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/
+	$(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/
+	$(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/
 
 uninstall-am:
-	-rm -rf $(DESTDIR)$(datadir)/doc/libwpg-@WPG_VERSION@/html
+	-rm -rf $(DESTDIR)$(docdir)/html
 
 all:
 	test -f header.html.in || $(LN_S) $(srcdir)/header.html.in ./