Updating branch refs/heads/master
         to 7f6e40bd038bc56fc6b0cb307914b291ab5583d3 (commit)
       from 48e0e7aea3baa73f37a29bf4c866a0f9aedc2560 (commit)

commit 7f6e40bd038bc56fc6b0cb307914b291ab5583d3
Author: Jannis Pohlmann <jan...@xfce.org>
Date:   Thu Oct 8 13:51:22 2009 +0200

    $(builddir) doesn't work in Maemo scratchbox, using $(top_builddir)

 tumbler/Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tumbler/Makefile.am b/tumbler/Makefile.am
index 9c33e47..6ca5f14 100644
--- a/tumbler/Makefile.am
+++ b/tumbler/Makefile.am
@@ -114,20 +114,20 @@ tumbler-marshal.h: stamp-tumbler-marshal.h
        @true
 
 stamp-tumbler-marshal.h: tumbler-marshal.list Makefile
-       cd $(builddir) \
+       cd $(top_builddir)/tumbler \
        && echo "#ifndef __TUMBLER_MARSHAL_H__" > xgen-emh \
        && echo "#define __TUMBLER_MARSHAL_H__" >> xgen-emh \
        && ( glib-genmarshal \
                --prefix=tumbler_marshal \
                --header $(srcdir)/tumbler-marshal.list ) >> xgen-emh \
-       && echo "#endif /* !__TUMBLER_MARSHAL_H__ */" >> xgen-emh \
+       && echo "#endif /*! __TUMBLER_MARSHAL_H__ */" >> xgen-emh \
        && ( cmp -s xgen-emh tumbler-marshal.h \
                || cp xgen-emh tumbler-marshal.h ) \
        && rm -f xgen-emh \
        && echo timestamp > $(@F)
 
 tumbler-marshal.c: tumbler-marshal.list Makefile
-       cd $(builddir) \
+       cd $(top_builddir)/tumbler \
        && echo "#include <tumbler/tumbler-marshal.h>" > xgen-emc \
        && ( glib-genmarshal \
                --prefix=tumbler_marshal \
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to