Commit 1c6977e6 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/docs/Makefile.am:
  Auto merged
parents 542f13cf 0de6a426

ndb/docs/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ ndbapidoc-pdf: ndbapi.pdf 


ndbapi.html: $(noinst_HEADERS)

	@set -x; \

	export NDB_RELEASE=$(NDB_RELEASE) \

	export NDB_RELEASE=$(NDB_RELEASE); \

	@RM@ -f ndbapi.pdf ndbapi.html; \

	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \

	mkdir -p $(DOXYTMP) $(DOXYOUT); \
@@ -70,7 +70,7 @@ mgmapidoc-pdf: mgmapi.pdf 


mgmapi.html: $(noinst_HEADERS)

	@set -x; \

	export NDB_RELEASE=$(NDB_RELEASE) \

	export NDB_RELEASE=$(NDB_RELEASE); \

	@RM@ -f mgmapi.pdf mgmapi.html; \

	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \

	mkdir -p $(DOXYTMP) $(DOXYOUT); \