From 0dda9524028509d6ddccd96794fd07637654c48f Mon Sep 17 00:00:00 2001 From: Jonathan Wilkes <jon.w.wilkes@gmail.com> Date: Tue, 20 Oct 2015 17:59:15 -0400 Subject: [PATCH] port from pd-l2ork: commit 21c7f7fafe356d722dd72ce27553793be0d023a9 *fixed potential package conflict with old pd-extended due to Gem includes. Moved them to /usr/include/pd-l2ork/Gem/ instead of /usr/include/Gem --- packages/linux_make/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile index d73d39f07..2eb5539b5 100644 --- a/packages/linux_make/Makefile +++ b/packages/linux_make/Makefile @@ -151,8 +151,9 @@ deb: $(bindir) rm -f $(DESTDIR)$(bindir)/cyclist rm -f $(DESTDIR)/usr/share/man/man1/pdsend.1.gz rm -f $(DESTDIR)/usr/share/man/man1/pdreceive.1.gz -#migrate Gem.pc to remove conflict with pd-vanilla and other variants +#migrate Gem.pc and includes to remove conflict with other pd variants and their packages -mv -f $(DESTDIR)$(libpddir)/../pkgconfig $(DESTDIR)$(libpddir)/ + -mv -f $(DESTDIR)$(bindir)/../include/Gem $(DESTDIR)$(bindir)/../include/pd-l2ork/ # debian packaging test -d $(DESTDIR)/DEBIAN || mkdir -p $(DESTDIR)/DEBIAN cp $(packages_src)/linux_make/debian/control $(DESTDIR)/DEBIAN -- GitLab