Autohell: Attempt to fix various packaging issues.

calf-studio-gear · Oct 27, 2017 · 9bfe5ad · 9bfe5ad
1 parent df767ed
commit 9bfe5ad
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git 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 $(wildcard sf2/*.sf2)
 
 dist_man_MANS = calf.7 calfjackhost.1
 
@@ -18,6 +18,8 @@ bashcompletiondir = $(BASH_COMPLETION_DIR)
 dist_bashcompletion_DATA = calf
 endif
 
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-bash-completion-dir=no
+
 clean-local:
 	rm -f *~ *.old *.bak
 	rm -rf autom4te.cache

diff --git a/configure.ac b/configure.ac
@@ -236,7 +236,7 @@ AC_ARG_WITH([bash-completion-dir],
 
 if test "x$with_bash_completion_dir" = "xyes"; then
     PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
-        [BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`"],
+        [BASH_COMPLETION_DIR="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`"],
         [BASH_COMPLETION_DIR="$datadir/bash-completion/completions"])
 else
     BASH_COMPLETION_DIR="$with_bash_completion_dir"

diff --git a/gui/Makefile.am b/gui/Makefile.am
@@ -5,15 +5,17 @@ EXTRA_DIST = $(wildcard $(srcdir)/styles) $(wildcard $(srcdir)/strips) $(wildcar
 
 install-data-hook:
 	$(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkgdatadir)
+	install -d -m 755 $(DESTDIR)$(pkgdatadir)/styles/
 	for f in ${STYLES}; do \
 		sn=`basename $${f}` ; \
-		sed 's#@guidatadir@#$(pkgdatadir)/styles/'$${sn}'#g' "$${f}"/gtk.rc.in >"$${f}"/gtk.rc ; \
+		install -d -m 755 $(DESTDIR)$(pkgdatadir)/styles/$${sn} ; \
+		install -c -m 644 $(srcdir)/styles/$${sn}/*.png $(DESTDIR)$(pkgdatadir)/styles/$${sn}/ ; \
+		sed 's#@guidatadir@#$(pkgdatadir)/styles/'$${sn}'#g' "$${f}"/gtk.rc.in >"$(DESTDIR)$(pkgdatadir)/styles/$${sn}/gtk.rc" ; \
 	done
-	cp -r $(srcdir)/styles $(DESTDIR)$(pkgdatadir)
-	rm -f $(srcdir)/styles/*/*.rc
-	rm -f $(DESTDIR)$(pkgdatadir)/styles/*/*.rc.in
-	cp -r $(srcdir)/gui $(DESTDIR)$(pkgdatadir)
-	cp -r $(srcdir)/strips $(DESTDIR)$(pkgdatadir)
+	install -d -m 755 $(DESTDIR)$(pkgdatadir)/gui
+	install -c -m 644 $(srcdir)/gui/*.xml $(DESTDIR)$(pkgdatadir)/gui/
+	install -d -m 755 $(DESTDIR)$(pkgdatadir)/strips
+	install -c -m 644 $(srcdir)/strips/*.xml $(DESTDIR)$(pkgdatadir)/strips/
 
 uninstall-hook:
 	rm -f $(DESTDIR)$(pkgdatadir)/*.rc

diff --git a/sf2/Vinyl - Crackle.sf2 → sf2/Crackle.sf2 b/sf2/Vinyl - Crackle.sf2 → sf2/Crackle.sf2
diff --git a/sf2/Vinyl - Crinkle.sf2 → sf2/Crinkle.sf2 b/sf2/Vinyl - Crinkle.sf2 → sf2/Crinkle.sf2
diff --git a/sf2/Vinyl - Hum.sf2 → sf2/Hum.sf2 b/sf2/Vinyl - Hum.sf2 → sf2/Hum.sf2
diff --git a/sf2/Vinyl - Motor.sf2 → sf2/Motor.sf2 b/sf2/Vinyl - Motor.sf2 → sf2/Motor.sf2
diff --git a/sf2/Vinyl - Noise.sf2 → sf2/Noise.sf2 b/sf2/Vinyl - Noise.sf2 → sf2/Noise.sf2
diff --git a/sf2/Vinyl - Rumble.sf2 → sf2/Rumble.sf2 b/sf2/Vinyl - Rumble.sf2 → sf2/Rumble.sf2
diff --git a/sf2/Vinyl - Static.sf2 → sf2/Static.sf2 b/sf2/Vinyl - Static.sf2 → sf2/Static.sf2
diff --git a/src/modules_dist.cpp b/src/modules_dist.cpp
@@ -777,13 +777,13 @@ void vinyl_audio_module::set_sample_rate(uint32_t sr)
     fluid_settings_setnum(settings, "synth.sample-rate", srate);
 
     std::string* paths = new std::string[_synths] {
-        PKGLIBDIR "sf2/Vinyl - Hum.sf2",
-        PKGLIBDIR "sf2/Vinyl - Motor.sf2",
-        PKGLIBDIR "sf2/Vinyl - Static.sf2",
-        PKGLIBDIR "sf2/Vinyl - Noise.sf2",
-        PKGLIBDIR "sf2/Vinyl - Rumble.sf2",
-        PKGLIBDIR "sf2/Vinyl - Crackle.sf2",
-        PKGLIBDIR "sf2/Vinyl - Crinkle.sf2"
+        PKGLIBDIR "sf2/Hum.sf2",
+        PKGLIBDIR "sf2/Motor.sf2",
+        PKGLIBDIR "sf2/Static.sf2",
+        PKGLIBDIR "sf2/Noise.sf2",
+        PKGLIBDIR "sf2/Rumble.sf2",
+        PKGLIBDIR "sf2/Crackle.sf2",
+        PKGLIBDIR "sf2/Crinkle.sf2"
     };
     int id;
     for (int i = 0; i < _synths; i++) {