[SCM] calf/master: + AutoHell: use correct directory for data files

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a2a574b86378afd2ff8f48cb770e4584415bac85
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Tue Jan 20 19:56:53 2009 +0000

    + AutoHell: use correct directory for data files

diff --git a/configure.ac b/configure.ac
index 74d70f6..11f0074 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ if test "$LV2_ENABLED" == "yes"; then
   AC_SUBST(with_lv2_dir)
 fi
 
-AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/lib/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
+AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
 
 # Checks for library functions.
 AC_CHECK_FUNCS([floor memset pow])
diff --git a/src/Makefile.am b/src/Makefile.am
index eaef565..b9fe93d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,13 +78,13 @@ clean-local:
 	$(RM) -f calfjackhost *~
 
 install-data-hook:
-	install -d -m 755 $(DESTDIR)$(pkglibdir)    
-	install -c -m 644 $(top_srcdir)/presets.xml $(DESTDIR)$(pkglibdir)
-	install -c -m 644 $(top_srcdir)/knob.png $(DESTDIR)$(pkglibdir)
-	$(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkglibdir)
-	install -c -m 644 $(top_srcdir)/gui/gui-*.xml $(DESTDIR)$(pkglibdir)
+	install -d -m 755 $(DESTDIR)$(pkgdatadir)    
+	install -c -m 644 $(top_srcdir)/presets.xml $(DESTDIR)$(pkgdatadir)
+	install -c -m 644 $(top_srcdir)/knob.png $(DESTDIR)$(pkgdatadir)
+	$(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkgdatadir)
+	install -c -m 644 $(top_srcdir)/gui/gui-*.xml $(DESTDIR)$(pkgdatadir)
 if USE_JACK
-	install -c -m 644 $(top_srcdir)/calf.glade $(DESTDIR)$(pkglibdir)
+	install -c -m 644 $(top_srcdir)/calf.glade $(DESTDIR)$(pkgdatadir)
 endif
 if USE_LADSPA
 	install -d -m 755 $(DESTDIR)$(with_ladspa_dir)
@@ -121,12 +121,12 @@ endif
 	rmdir -p $(DESTDIR)$(with_lv2_dir)/calf.lv2 || true
 endif
 if USE_JACK
-	rm -f $(DESTDIR)$(pkglibdir)/calf.glade 
+	rm -f $(DESTDIR)$(pkgdatadir)/calf.glade 
 endif
-	rm -f $(DESTDIR)$(pkglibdir)/gui-*.xml
-	rm -f $(DESTDIR)$(pkglibdir)/presets.xml
-	rm -f $(DESTDIR)$(pkglibdir)/knob.png
-	rmdir $(DESTDIR)$(pkglibdir) || true
+	rm -f $(DESTDIR)$(pkgdatadir)/gui-*.xml
+	rm -f $(DESTDIR)$(pkgdatadir)/presets.xml
+	rm -f $(DESTDIR)$(pkgdatadir)/knob.png
+	rmdir $(DESTDIR)$(pkgdatadir) || true
 if USE_LADSPA
 	$(RM) -f $(DESTDIR)$(with_ladspa_dir)/calf.so
 	$(RM) -f $(DESTDIR)$(with_ladspa_rdf_dir)/calf.rdf

-- 
calf audio plugins packaging