|
From: <sv...@va...> - 2009-06-15 04:42:16
|
Author: njn Date: 2009-06-15 05:42:11 +0100 (Mon, 15 Jun 2009) New Revision: 10324 Log: Back out unintended changes to docs/Makefile.am from the last commit. And remove some commented out code in mpi/Makefile.am. Modified: branches/BUILD_TWEAKS/docs/Makefile.am branches/BUILD_TWEAKS/mpi/Makefile.am Modified: branches/BUILD_TWEAKS/docs/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/docs/Makefile.am 2009-06-15 04:35:42 UTC (rev 10323) +++ branches/BUILD_TWEAKS/docs/Makefile.am 2009-06-15 04:42:11 UTC (rev 10324) @@ -7,7 +7,7 @@ # Comment out the next line to skip building print docs. The default # is not to skip building print docs. Note, after changing it # you of course need to re-run configure to make it take effect. -#BUILD_ALL_DOCS=yes +BUILD_ALL_DOCS=yes ##------------------------------------------------------------- ## END OF HACK @@ -55,7 +55,7 @@ XSL_FO_STYLE = $(mylibdir)/vg-fo.xsl XSL_TEXT_STYLE = $(mylibdir)/vg-faq2txt.xsl XSL_WEBSITE_STYLE = $(mylibdir)/vg-html-website.xsl -XSL_MAN_STYLE = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl +XSL_MAN_STYLE = /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl all-docs: FAQ.txt man-page html-docs print-docs Modified: branches/BUILD_TWEAKS/mpi/Makefile.am =================================================================== --- branches/BUILD_TWEAKS/mpi/Makefile.am 2009-06-15 04:35:42 UTC (rev 10323) +++ branches/BUILD_TWEAKS/mpi/Makefile.am 2009-06-15 04:42:11 UTC (rev 10324) @@ -72,23 +72,6 @@ libmpiwrap_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = $(LDFLAGS_MPI) endif -## And some hacks to keep 'make dist' happy. -## It would seem that using nodist_SOURCES is the right fix, but -## I can't figure out how to do it. -## -#nodist_SOURCES = libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c -#nodist_SOURCES = libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c - -#libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c: -# rm -f libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c -# touch libmpiwrap-@VGCONF_ARCH_PRI@-@VGCONF_OS@.c -#if VGCONF_HAVE_PLATFORM_SEC -#libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c: -# rm -f libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c -# touch libmpiwrap-@VGCONF_ARCH_SEC@-@VGCONF_OS@.c -#endif - - #---------------------------------------------------------------------------- # General stuff #---------------------------------------------------------------------------- |