[SCM] calf/master: AutoHell fixes.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8d3621f70eec8b5b6955e41bf473cdaf26e0db00
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Wed Feb 22 14:41:05 2012 +0000

    AutoHell fixes.

diff --git a/Makefile.am b/Makefile.am
index 41b64d2..e49d811 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ dist_desktopfiles_DATA = calf.desktop
 
 docdir = $(datadir)/doc/${PACKAGE}
 
-EXTRA_DIST = COPYING.GPL TODO autogen.sh presets.xml calf.7 calfjackhost.1 calf-gui.xml doc/manuals/
+EXTRA_DIST = COPYING.GPL TODO autogen.sh presets.xml calf.7 calfjackhost.1 calf-gui.xml doc/manuals
 
 dist_man_MANS = calf.7 calfjackhost.1
 
@@ -21,15 +21,15 @@ install-data-local:
 	install -d -m 755 $(DESTDIR)$(docdir)
 	install -d -m 755 $(DESTDIR)$(docdir)/images
 	install -d -m 755 $(DESTDIR)$(docdir)/scripts
-	install -c -m 644 doc/manuals/*.html $(DESTDIR)$(docdir)
-	install -c -m 644 doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/
-	install -c -m 644 gui/background_dark.png $(DESTDIR)$(docdir)/images/
-	install -c -m 644 doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/
-	install -c -m 644 doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/
+	install -c -m 644 $(top_srcdir)/doc/manuals/*.html $(DESTDIR)$(docdir)
+	install -c -m 644 $(top_srcdir)/doc/manuals/images/*.png $(DESTDIR)$(docdir)/images/
+	install -c -m 644 $(top_srcdir)/gui/background_dark.png $(DESTDIR)$(docdir)/images/
+	install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.css $(DESTDIR)$(docdir)/scripts/
+	install -c -m 644 $(top_srcdir)/doc/manuals/scripts/*.js $(DESTDIR)$(docdir)/scripts/
         
 uninstall-local:
 	rm -f $(DESTDIR)$(docdir)/*.html
 	rm -f $(DESTDIR)$(docdir)/images/*.png
 	rm -f $(DESTDIR)$(docdir)/scripts/*.css
 	rm -f $(DESTDIR)$(docdir)/scripts/*.js
-	rmdir $(DESTDIR)$(docdir) || true
+	rmdir $(DESTDIR)$(docdir)/scripts $(DESTDIR)$(docdir)/images $(DESTDIR)$(docdir) || true
diff --git a/icons/Makefile.am b/icons/Makefile.am
index fa00ab4..1dba86f 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -4,12 +4,12 @@ SIZES = 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256
 install-data-hook:
 	-for fn in $(SIZES); do \
 		mkdir -p "$(DESTDIR)$(datadir)/icons/hicolor/$${fn}/apps/"; \
-		cp "calf_$${fn}.png" "$(DESTDIR)$(datadir)/icons/hicolor/$${fn}/apps/calf.png"; \
-		cp "calf_plugin_$${fn}.png" "$(DESTDIR)$(datadir)/icons/hicolor/$${fn}/apps/calf_plugin.png"; \
+		cp "$(top_srcdir)/icons/calf_$${fn}.png" "$(DESTDIR)$(datadir)/icons/hicolor/$${fn}/apps/calf.png"; \
+		cp "$(top_srcdir)/icons/calf_plugin_$${fn}.png" "$(DESTDIR)$(datadir)/icons/hicolor/$${fn}/apps/calf_plugin.png"; \
 	done
 	mkdir -p "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/"; \
-	cp "calf_scalable.svg" "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/calf.svg";
-	cp "calf_plugin_scalable.svg" "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/calf_plugin.svg";
+	cp "$(top_srcdir)/icons/calf_scalable.svg" "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/calf.svg";
+	cp "$(top_srcdir)/icons/calf_plugin_scalable.svg" "$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/calf_plugin.svg";
 	@-test -z "$(DESTDIR)" && gtk-update-icon-cache -f -t $(DESTDIR)$(datadir)/icons/hicolor
 	
 uninstall-hook:

-- 
calf audio plugins packaging