From 12a8721655dd49767f68baf943fdb972b4c1bcac Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt <mikael@djurfeldt.com> Date: Mon, 2 Dec 2019 15:22:06 +0100 Subject: [PATCH] Package build fixes --- debian/libmusic-dev.examples | 10 +++++----- debian/rules | 4 ++-- pymusic/Makefile.am | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/libmusic-dev.examples b/debian/libmusic-dev.examples index b93e931..2bd4a57 100644 --- a/debian/libmusic-dev.examples +++ b/debian/libmusic-dev.examples @@ -1,5 +1,5 @@ -test/README -test/*.cc -test/*.music -test/*.data -test/*.dat +examples/README +examples/*.cc +examples/*.music +examples/*.data +examples/*.dat diff --git a/debian/rules b/debian/rules index 42d915c..d554037 100755 --- a/debian/rules +++ b/debian/rules @@ -10,8 +10,8 @@ override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Remove rpaths in libraries and binaries - ( cd $(CURDIR)/debian/tmp/usr/lib/*; chrpath -d libmusic.so libmusic-c.so ) - ( cd $(CURDIR)/debian/tmp/usr/bin; chrpath -d eventcounter eventgenerator eventlogger eventselect eventsink eventsource music viewevents ) + ( cd $(CURDIR)/debian/tmp/usr/lib/$(DEB_TARGET_GNU_TYPE); chrpath -d libmusic.so libmusic-c.so ) + ( cd $(CURDIR)/debian/tmp/usr/bin; chrpath -d contsink eventcounter eventgenerator eventlogger eventselect eventsink eventsource messagesource music viewevents ) # Build manual # ( cd $(CURDIR)/doc; make music-manual.pdf ) diff --git a/pymusic/Makefile.am b/pymusic/Makefile.am index 4231039..6ec0b64 100644 --- a/pymusic/Makefile.am +++ b/pymusic/Makefile.am @@ -1,5 +1,7 @@ -EXTRA_DIST = setup.py.in tests.py pymusic.pyx pymusic.pxd pybuffer.pyx pybuffer.pxd +EXTRA_DIST = setup.py.in tests.py pymusic.pyx pymusic.pxd pybuffer.pyx pybuffer.pxd \ + music/__init__.py music/music_c.h music/pybuffer.pxd music/pymusic.pxd \ + music/pymusic_c.h mpi_compat.h BUILT_SOURCES = pymusic.cpp pybuffer.cpp -- GitLab