[SCM] calf/master: Attempt to replace a hardcoded path with something that at least resembles pkgdatadir.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ad64bd8a1aaf667b5c527e63252b91eb371c26c7
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Mon Oct 8 22:51:40 2012 +0100

    Attempt to replace a hardcoded path with something that at least resembles pkgdatadir.

diff --git a/configure.ac b/configure.ac
index 3d42989..e48e5b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,7 +213,6 @@ AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation direc
 AC_CONFIG_FILES([Makefile
                  calf.desktop
                  gui/Makefile
-                 gui/calf.rc
                  icons/Makefile
                  src/Makefile
                  src/calf/Makefile])
diff --git a/gui/Makefile.am b/gui/Makefile.am
index ee75a25..8e8bbc8 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -4,7 +4,7 @@ install-data-hook:
 	install -c -m 644 $(srcdir)/*.png $(DESTDIR)$(pkgdatadir)
 	$(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkgdatadir)
 	install -c -m 644 $(srcdir)/gui-*.xml $(DESTDIR)$(pkgdatadir)
-	sed 's#@pkgdatadir@#$(pkgdatadir)#g' $(srcdir)/calf.rc.in >$(top_builddir)/calf.rc
+	sed 's#@guidatadir@#$(pkgdatadir)#g' $(srcdir)/calf.rc.in >$(top_builddir)/calf.rc
 	install -c -m 644 $(top_builddir)/calf.rc $(DESTDIR)$(pkgdatadir)
 	rm -f $(top_builddir)/calf.rc
 
diff --git a/gui/calf.rc.in b/gui/calf.rc.in
index 4e06d57..5ccf003 100644
--- a/gui/calf.rc.in
+++ b/gui/calf.rc.in
@@ -8,7 +8,7 @@
 
 #gtk_color_scheme = "calf_fg_color:#101010\ncalf_bg_color:#EFEBE7\ncalf_base_color:#FFF\ncalf_text_color:#1A1A1A\ncalf_selected_bg_color:#FFA443\ncalf_selected_fg_color:#1A1A1A\ncalf_tooltip_bg_color:#F5F5B5\ncalf_tooltip_fg_color:#000"
 
-pixmap_path "/usr/local/share/calf"
+pixmap_path "@guidatadir@"
 
 style "calf-default"
 {

-- 
calf audio plugins packaging