summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/ChangeLog1
-rw-r--r--muse/share/scripts/Makefile.am9
-rw-r--r--muse/utils/Makefile.am7
3 files changed, 11 insertions, 6 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog
index 45978937..42bceab3 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -3,6 +3,7 @@
- Changed midievent.cpp MidiEventBase::write(). Now saves value A, B, C and sysex/meta data. Tested OK.
* Fixed: Midi meters now show for each track even if they're all on same device and channel. (T356)
- Oversight, long overdue. The meters AND automation control needed to be 'per-track'.
+ * Applied: muse-destdir.patch Scripts and utils packaging fix submitted by Orcan Ogetbil. (T356)
06.01.2010
* Feature: Jack transport enable/disable in Midi Sync settings window. Stores setting per-song. (T356)
- Should be Ok to use and test. Needs a bit more work. See jack.cpp and jackaudio.h
diff --git a/muse/share/scripts/Makefile.am b/muse/share/scripts/Makefile.am
index 746bbb65..6b391e3a 100644
--- a/muse/share/scripts/Makefile.am
+++ b/muse/share/scripts/Makefile.am
@@ -5,7 +5,10 @@ EXTRA_DIST = DoNothing RemoveShortEvents DoubleSpeed ConstantLength SwingQuantiz
#musemidiscriptspkgdatadir = $(pkgdatadir)/scripts
install-data-local:
- mkdir -p $(pkgdatadir)/scripts/
- cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
- chmod a+x $(pkgdatadir)/scripts/*
+ # mkdir -p $(pkgdatadir)/scripts/
+ # cp $(EXTRA_DIST) $(pkgdatadir)/scripts/
+ # chmod a+x $(pkgdatadir)/scripts/*
+ mkdir -p $(DESTDIR)/$(pkgdatadir)/scripts/
+ cp $(EXTRA_DIST) $(DESTDIR)/$(pkgdatadir)/scripts/
+ chmod a+x $(DESTDIR)/$(pkgdatadir)/scripts/*
diff --git a/muse/utils/Makefile.am b/muse/utils/Makefile.am
index 9bc0bad6..bdb72e82 100644
--- a/muse/utils/Makefile.am
+++ b/muse/utils/Makefile.am
@@ -1,6 +1,7 @@
EXTRA_DIST = muse-find-unused-wavs
install-data-local:
- cp $(EXTRA_DIST) $(bindir)/
- chmod a+x $(bindir)/$(EXTRA_DIST)
-
+ # cp $(EXTRA_DIST) $(bindir)/
+ # chmod a+x $(bindir)/$(EXTRA_DIST)
+ cp $(EXTRA_DIST) $(DESTDIR)/$(bindir)/
+ chmod a+x $(DESTDIR)/$(bindir)/$(EXTRA_DIST)