[gnome-photos] build: Fix $(srcdir) != $(builddir)



commit ca95ddc82f69d116bde86a6abbe5a3a4a5372934
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Jan 17 11:36:45 2014 +0100

    build: Fix $(srcdir) != $(builddir)
    
    AUTHORS is generated, so it is in $(top_builddir).
    
    Fixes: https://bugzilla.gnome.org/715043

 src/Makefile.am           |    8 ++++----
 src/photos-generate-about |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index cb1f276..82def56 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -325,21 +325,21 @@ gegl-gtk-marshal.c: gegl-gtk-marshal.list gegl-gtk-marshal.h Makefile
 photos-about-data.h: stamp-photos-about-data.h
        @true
 
-stamp-photos-about-data.h: $(top_srcdir)/ARTISTS $(top_srcdir)/AUTHORS
+stamp-photos-about-data.h: $(top_srcdir)/ARTISTS $(top_builddir)/AUTHORS
        $(AM_V_GEN) ( \
                ( $(srcdir)/photos-generate-about \
-                       --header $(top_srcdir) \
+                       --header $(top_builddir) $(top_srcdir) \
                 ) >> xgen-ah \
                && ( cmp -s xgen-ah photos-about-data.h || cp xgen-ah photos-about-data.h ) \
                && rm -f xgen-ah \
                && echo timestamp > $(@F) \
        )
 
-photos-about-data.c: $(top_srcdir)/ARTISTS $(top_srcdir)/AUTHORS
+photos-about-data.c: $(top_srcdir)/ARTISTS $(top_builddir)/AUTHORS
        $(AM_V_GEN) ( \
                echo "#include \"photos-about-data.h\"" > xgen-ac \
                && ( $(srcdir)/photos-generate-about \
-                       --body $(top_srcdir) \
+                       --body $(top_builddir) $(top_srcdir) \
                    ) >> xgen-ac \
                && ( cmp -s xgen-ac photos-about-data.c || cp xgen-ac photos-about-data.c ) \
                && rm -f xgen-ac \
diff --git a/src/photos-generate-about b/src/photos-generate-about
index 48e4ee9..7005f38 100755
--- a/src/photos-generate-about
+++ b/src/photos-generate-about
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Photos - access, organize and share your photos on GNOME
-# Copyright © 2012 Red Hat, Inc.
+# Copyright © 2012, 2014 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@ while read line; do
     [ ${#line} -eq 0 ] &&
         continue
     echo "  \"$line\","
-done < $2/ARTISTS
+done < $3/ARTISTS
 echo "  NULL"
 echo "};"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]