[SCM] gsequencer/upstream: fixed distcheck

[jkraehemann-guest at users.alioth.debian.org]

The following commit has been merged in the upstream branch:
commit ae417c660372b681c4d9fa312da28228953a560d
Author: Joël Krähemann <weedlight at gmail.com>
Date:   Fri Jun 12 19:30:32 2015 +0200

    fixed distcheck

diff --git a/Makefile.am b/Makefile.am
index 20dc76d..4352539 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,17 @@
 AUTOMAKE_OPTIONS = foreign
 # SUBDIRS = src doc
 
+AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\"
+
 # what flags you want to pass to the C compiler & linker
-CFLAGS = -g -I./src -I/usr/include
-LDFLAGS = -L/lib -L/usr/lib -L/usr/X11/lib
+CFLAGS = 
+LDFLAGS = 
 
 # this lists the binaries to produce, the (non-PHONY, binary) targets in
 # the previous manual Makefile
 noinst_LIBRARIES = 
 bin_PROGRAMS = ags
-EXTRA_DIST =
+EXTRA_DIST = gsequencer
 CLEANFILES =
 
 # library
@@ -23,7 +25,7 @@ ags_LDFLAGS= -ldl $(LDFLAGS) $(UUID_LIBS) $(LIBASOUND2_LIBS) $(LIBAO_LIBS) $(LIB
 ags_LDADD = 
 
 appdatadir = $(datadir)/applications
-appdata_DATA = ags.desktop
+appdata_DATA = ags.desktop 
 
 EXTRA_DIST += ags.desktop.in
 CLEANFILES += $(appdata_DATA)
@@ -36,5 +38,8 @@ ags.desktop: ags.desktop.in
 install-data-local:
 	mkdir -p $(DESTDIR)/$(datadir)/gsequencer/icons
 	mkdir -p $(DESTDIR)/$(datadir)/gsequencer/images
-	cp doc/images/jumper.png $(DESTDIR)/$(datadir)/gsequencer/icons/jumper.png
-	cp doc/images/ags.png $(DESTDIR)/$(datadir)/gsequencer/images/ags.png
+	cp $(top_srcdir)/gsequencer/icons/jumper.png $(DESTDIR)/$(datadir)/gsequencer/icons/jumper.png
+	cp $(top_srcdir)/gsequencer/images/ags.png $(DESTDIR)/$(datadir)/gsequencer/images/ags.png
+
+uninstall-hook:
+	rm -rf $(DESTDIR)/$(datadir)/gsequencer
diff --git a/src/ags/X/ags_menu_bar_callbacks.c b/src/ags/X/ags_menu_bar_callbacks.c
index 4cb280a..6b54950 100644
--- a/src/ags/X/ags_menu_bar_callbacks.c
+++ b/src/ags/X/ags_menu_bar_callbacks.c
@@ -1,3 +1,4 @@
+
 /* AGS - Advanced GTK Sequencer
  * Copyright (C) 2005-2011 Joël Krähemann
  *
@@ -470,19 +471,22 @@ ags_menu_bar_about_callback(GtkWidget *menu_item, AgsMenuBar *menu_bar)
 
   gchar *authors[] = { "Joël Krähemann\0", NULL }; 
 
-  if(file == NULL){
-    file = fopen("/usr/share/common-licenses/GPL-3\0", "r\0");
-    stat("/usr/share/common-licenses/GPL-3\0", &sb);
-    license = (gchar *) malloc((sb.st_size + 1) * sizeof(gchar));
-    fread(license, sizeof(char), sb.st_size, file);
-    license[sb.st_size] = '\0';
-    fclose(file);
+  if(g_file_test("/usr/share/common-licenses/GPL-3\0",
+		 G_FILE_TEST_EXISTS)){
+    if(file == NULL){
+      file = fopen("/usr/share/common-licenses/GPL-3\0", "r\0");
+      stat("/usr/share/common-licenses/GPL-3\0", &sb);
+      license = (gchar *) malloc((sb.st_size + 1) * sizeof(gchar));
+      fread(license, sizeof(char), sb.st_size, file);
+      license[sb.st_size] = '\0';
+      fclose(file);
 
-    error = NULL;
+      error = NULL;
 
-    logo = gdk_pixbuf_new_from_file("/usr/share/gsequencer/images/ags.png\0", &error);
+      logo = gdk_pixbuf_new_from_file(g_strdup_printf("%s%s\0", DESTDIR, "/gsequencer/images/ags.png\0"), &error);
+    }
   }
-
+  
   gtk_show_about_dialog((GtkWindow *) gtk_widget_get_ancestor((GtkWidget *) menu_bar, GTK_TYPE_WINDOW),
 			"program-name\0", "ags\0",
 			"authors\0", authors,
diff --git a/src/ags/X/ags_window.c b/src/ags/X/ags_window.c
index 5098385..2ef1a5e 100644
--- a/src/ags/X/ags_window.c
+++ b/src/ags/X/ags_window.c
@@ -170,7 +170,7 @@ ags_window_init(AgsWindow *window)
   error = NULL;
   
   g_object_set(G_OBJECT(window),
-  	       "icon\0", gdk_pixbuf_new_from_file("/usr/share/gsequencer/icons/jumper.png\0", &error),
+  	       "icon\0", gdk_pixbuf_new_from_file(g_strdup_printf("%s%s\0", DESTDIR, "/gsequencer/icons/jumper.png\0"), &error),
   	       NULL);
 
   window->ags_main = NULL;

-- 
gsequencer packaging