Re: html-doc; make distcheck fails

2007-07-19 Thread Dominik Vogt
On Thu, Jul 19, 2007 at 11:32:26PM +1000, Scott Smedley wrote:
> Hi Dominik,
> 
> > > I notice you made a change to doc/Makefile.am. Did that fix your
> > > problem? I'm surprised if it did.
> > 
> > No, I just reformatted it slightly:
> 
> I was referring to this change:
> 
> -   @ cp $(srcdir)/$@ $@
> +   @cp $(srcdir)/$@ $(top_builddir)/doc/$@
> 
> I notice you've changed it to:
> 
> %.html: $(srcdir)/$@
> test x"$(top_srcdir)" = x"$(top_builddir)" || \
> cp $(srcdir)/$@ $(top_builddir)/doc/$@
> 
> Does this fix your problem?

Yup.

Ciao

Dominik ^_^  ^_^

 --
Dominik Vogt, dominik.vogt (at) gmx.de


signature.asc
Description: Digital signature


Problems building snap-20070719

2007-07-19 Thread Jason L Tibbitts III
or `all'.
make[2]: Leaving directory `/home/tibbs/fvwm/utils'
Making all in perllib
make[2]: Entering directory `/home/tibbs/fvwm/perllib'
Making all in FVWM
make[3]: Entering directory `/home/tibbs/fvwm/perllib/FVWM'
Making all in Module
make[4]: Entering directory `/home/tibbs/fvwm/perllib/FVWM/Module'
make[4]: Nothing to be done for `all'.
make[4]: Leaving directory `/home/tibbs/fvwm/perllib/FVWM/Module'
Making all in Tracker
make[4]: Entering directory `/home/tibbs/fvwm/perllib/FVWM/Tracker'
make[4]: Nothing to be done for `all'.
make[4]: Leaving directory `/home/tibbs/fvwm/perllib/FVWM/Tracker'
make[4]: Entering directory `/home/tibbs/fvwm/perllib/FVWM'
make[4]: Nothing to be done for `all-am'.
make[4]: Leaving directory `/home/tibbs/fvwm/perllib/FVWM'
make[3]: Leaving directory `/home/tibbs/fvwm/perllib/FVWM'
Making all in General
make[3]: Entering directory `/home/tibbs/fvwm/perllib/General'
make[3]: Nothing to be done for `all'.
make[3]: Leaving directory `/home/tibbs/fvwm/perllib/General'
make[3]: Entering directory `/home/tibbs/fvwm/perllib'
make[3]: Nothing to be done for `all-am'.
make[3]: Leaving directory `/home/tibbs/fvwm/perllib'
make[2]: Leaving directory `/home/tibbs/fvwm/perllib'
Making all in doc
make[2]: Entering directory `/home/tibbs/fvwm/doc'
Making all in fvwm
make[3]: Entering directory `/home/tibbs/fvwm/doc/fvwm'
make[3]: Nothing to be done for `all'.
make[3]: Leaving directory `/home/tibbs/fvwm/doc/fvwm'
Making all in commands
make[3]: Entering directory `/home/tibbs/fvwm/doc/commands'
make[3]: Nothing to be done for `all'.
make[3]: Leaving directory `/home/tibbs/fvwm/doc/commands'
Making all in images
make[3]: Entering directory `/home/tibbs/fvwm/doc/images'
Making all in svg_rendering
make[4]: Entering directory `/home/tibbs/fvwm/doc/images/svg_rendering'
make[4]: Nothing to be done for `all'.
make[4]: Leaving directory `/home/tibbs/fvwm/doc/images/svg_rendering'
make[4]: Entering directory `/home/tibbs/fvwm/doc/images'
make[4]: Nothing to be done for `all-am'.
make[4]: Leaving directory `/home/tibbs/fvwm/doc/images'
make[3]: Leaving directory `/home/tibbs/fvwm/doc/images'
Making all in modules
make[3]: Entering directory `/home/tibbs/fvwm/doc/modules'
make[3]: Nothing to be done for `all'.
make[3]: Leaving directory `/home/tibbs/fvwm/doc/modules'
make[3]: Entering directory `/home/tibbs/fvwm/doc'
make[3]: Nothing to be done for `all-am'.
make[3]: Leaving directory `/home/tibbs/fvwm/doc'
make[2]: Leaving directory `/home/tibbs/fvwm/doc'
Making all in docs
make[2]: Entering directory `/home/tibbs/fvwm/docs'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/tibbs/fvwm/docs'
Making all in rpm
make[2]: Entering directory `/home/tibbs/fvwm/rpm'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/tibbs/fvwm/rpm'
Making all in debian
make[2]: Entering directory `/home/tibbs/fvwm/debian'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/tibbs/fvwm/debian'
Making all in sample.fvwmrc
make[2]: Entering directory `/home/tibbs/fvwm/sample.fvwmrc'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/tibbs/fvwm/sample.fvwmrc'
Making all in po
make[2]: Entering directory `/home/tibbs/fvwm/po'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/home/tibbs/fvwm/po'
Making all in tests
make[2]: Entering directory `/home/tibbs/fvwm/tests'
Making all in hints
make[3]: Entering directory `/home/tibbs/fvwm/tests/hints'
make[3]: Nothing to be done for `all'.
make[3]: Leaving directory `/home/tibbs/fvwm/tests/hints'
make[3]: Entering directory `/home/tibbs/fvwm/tests'
make[3]: Nothing to be done for `all-am'.
make[3]: Leaving directory `/home/tibbs/fvwm/tests'
make[2]: Leaving directory `/home/tibbs/fvwm/tests'
make[2]: Entering directory `/home/tibbs/fvwm'
make[2]: Leaving directory `/home/tibbs/fvwm'
make[1]: Leaving directory `/home/tibbs/fvwm'
{ test ! -d fvwm-snap-20070719 || { find fvwm-snap-20070719 -type d ! -perm 
-200 -exec chmod u+w {} ';' && rm -fr fvwm-snap-20070719; }; }
mkdir fvwm-snap-20070719
mkdir -p -- fvwm-snap-20070719/bin fvwm-snap-20070719/debian 
fvwm-snap-20070719/doc fvwm-snap-20070719/docs fvwm-snap-20070719/fvwm 
fvwm-snap-20070719/modules/FvwmAnimate fvwm-snap-20070719/modules/FvwmAuto 
fvwm-snap-20070719/modules/FvwmBacker fvwm-snap-20070719/modules/FvwmBanner 
fvwm-snap-20070719/modules/FvwmButtons fvwm-snap-20070719/modules/FvwmCommand 
fvwm-snap-20070719/modules/FvwmConsole fvwm-snap-20070719/modules/FvwmCpp 
fvwm-snap-20070719/modules/FvwmDebug fvwm-snap-20070719/modules/FvwmDragWell 
fvwm-snap-20070719/mod

Re: html-doc; make distcheck fails

2007-07-19 Thread Scott Smedley
Hi Dominik,

> > I notice you made a change to doc/Makefile.am. Did that fix your
> > problem? I'm surprised if it did.
> 
> No, I just reformatted it slightly:

I was referring to this change:

-   @ cp $(srcdir)/$@ $@
+   @cp $(srcdir)/$@ $(top_builddir)/doc/$@

I notice you've changed it to:

%.html: $(srcdir)/$@
test x"$(top_srcdir)" = x"$(top_builddir)" || \
cp $(srcdir)/$@ $(top_builddir)/doc/$@

Does this fix your problem?

Scott.



CVS domivogt: * Fixed distclean/distcheck targets.

2007-07-19 Thread FVWM CVS
CVSROOT:/home/cvs/fvwm
Module name:fvwm
Changes by: domivogt07/07/19 05:42:20

Modified files:
doc: ChangeLog Makefile.am 
doc/fvwm   : Makefile.am 
doc/images : Makefile.am 
doc/images/svg_rendering: Makefile.am 

Log message:
* Fixed distclean/distcheck targets.




CVS domivogt: * Make distcheck fixes.

2007-07-19 Thread FVWM CVS
CVSROOT:/home/cvs/fvwm
Module name:fvwm
Changes by: domivogt07/07/19 04:30:21

Modified files:
.  : ChangeLog 
doc: ChangeLog Makefile.am 
doc/images : Makefile.am 
doc/images/svg_rendering: Makefile.am 
libs   : PictureImageLoader.c 

Log message:
* Make distcheck fixes.




Re: html-doc; make distcheck fails

2007-07-19 Thread Dominik Vogt
On Thu, Jul 19, 2007 at 05:16:05PM +1000, Scott Smedley wrote:
> Hi Dominik,
> 
> On Thu, Jul 19, 2007 at 12:15:33AM +0200, Dominik Vogt wrote:
> > ...
> > make[1]: Entering directory `/home/luthien/src/fvwm/doc'
> > cp: `./header.html' and `header.html' are the same file
> > make[1]: *** [header.html] Error 1
> > make[1]: Leaving directory `/home/luthien/src/fvwm/doc'
> > make: *** [distdir] Error 1
> > 
> > This line from doc/Makefile.am is responsible:
> > 
> >   %.html: $(srcdir)/$@
> >   @cp $(srcdir)/$@ $@
> > 
> > In a normal build environment, the top_builddir and the srcdir are
> > the same, do the cp fails.  I'm not sure how this is all meant,
> > but if the file comes from CVS it is not built and should not be
> > copied to the top_builddir.
> 
> When top_builddir == srcdir, I don't want make to do anything.
> 
> When top_builddir != srcdir, I want to 'cp' to top_builddir so that
> I can point my browser at the built documentation & see that everything
> is ok.
> 
> See the "Problems building snap-20070713" thread.
> 
> I notice you made a change to doc/Makefile.am. Did that fix your
> problem? I'm surprised if it did.

No, I just reformatted it slightly:

 * Break long lines
 * Set variables like this

 foo = bar

   instead of this

 foo=bar

   (this is the way it's done in makefiles).

Ciao

Dominik ^_^  ^_^

 --
Dominik Vogt, dominik.vogt (at) gmx.de


signature.asc
Description: Digital signature


CVS scott: applied Simon's "small fix".

2007-07-19 Thread FVWM CVS
CVSROOT:/home/cvs/fvwm
Module name:fvwm
Changes by: scott   07/07/19 02:36:14

Modified files:
.  : ChangeLog 
libs   : PictureImageLoader.c 

Log message:
applied Simon's "small fix".




Re: html-doc; make distcheck fails

2007-07-19 Thread Scott Smedley
Hi Dominik,

On Thu, Jul 19, 2007 at 12:15:33AM +0200, Dominik Vogt wrote:
> ...
> make[1]: Entering directory `/home/luthien/src/fvwm/doc'
> cp: `./header.html' and `header.html' are the same file
> make[1]: *** [header.html] Error 1
> make[1]: Leaving directory `/home/luthien/src/fvwm/doc'
> make: *** [distdir] Error 1
> 
> This line from doc/Makefile.am is responsible:
> 
>   %.html: $(srcdir)/$@
>   @cp $(srcdir)/$@ $@
> 
> In a normal build environment, the top_builddir and the srcdir are
> the same, do the cp fails.  I'm not sure how this is all meant,
> but if the file comes from CVS it is not built and should not be
> copied to the top_builddir.

When top_builddir == srcdir, I don't want make to do anything.

When top_builddir != srcdir, I want to 'cp' to top_builddir so that
I can point my browser at the built documentation & see that everything
is ok.

See the "Problems building snap-20070713" thread.

I notice you made a change to doc/Makefile.am. Did that fix your
problem? I'm surprised if it did.

Scott.



CVS scott: really commit Simon's SVG patch.

2007-07-19 Thread FVWM CVS
CVSROOT:/home/cvs/fvwm
Module name:fvwm
Changes by: scott   07/07/19 02:09:54

Modified files:
fvwm   : menus.c 
libs   : PictureImageLoader.c 

Log message:
really commit Simon's SVG patch.