diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-01-07 08:39:12 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-01-07 08:39:12 +0000 |
| commit | c6e6c2afe109c615a9a781c69086a8425390c019 (patch) | |
| tree | ad0f5a0ac36c2f8e94dc07cbd45d82649f1cf8be | |
| parent | 026e6bc92bef207a4e7c0efe9c7c4d5b34d5156d (diff) | |
Packaging fix submitted by Orcan Ogetbil.
| -rw-r--r-- | muse/ChangeLog | 1 | ||||
| -rw-r--r-- | muse/share/scripts/Makefile.am | 9 | ||||
| -rw-r--r-- | muse/utils/Makefile.am | 7 |
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) |