On 3/19/06, Hugo Villeneuve <[EMAIL PROTECTED]> wrote: > On Sun, 19 Mar 2006 11:44:08 -0700 > Archaic <[EMAIL PROTECTED]> wrote: > > Ultimately, though, this needs to be > > sent upstream. > > This is the solution I came up with, to fix the problem at the source > (Makefile.am) and also in the autoconf generated Makefile.in by using a patch.
I keep ignoring the upstream aspect, but let's try to get something together. Hugo, your patch is right, but you don't need to adjust Makefile.in. Once you run autogen.sh, Makefile.in will be regenerated with the proper @HAVE_DOXYGEN_TRUE@ tags in front of the relevant targets. I'm attaching a proper diff to the CVS I just pulled. I'll submit it upstream, but not this second. If anyone beats me to it, go for it. -- Dan
Index: doc/Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif/doc/Makefile.am,v retrieving revision 1.7 diff -u -r1.7 Makefile.am --- doc/Makefile.am 18 Jul 2005 20:36:24 -0000 1.7 +++ doc/Makefile.am 19 Mar 2006 19:23:21 -0000 @@ -74,12 +74,16 @@ all-local: $(DOXYGEN_STAMPS) +if HAVE_DOXYGEN + install-data-local: install-apidocs install-apidocs-internals uninstall-local: uninstall-apidocs uninstall-apidocs-internals clean-local: clean-apidocs +endif + upload: $(DOXYGEN_UPLOAD) CLEANFILES = $(DOXYGEN_FILES) $(DOXYGEN_STAMPS)
-- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
