FWIW, please see attached Makefile changes that fix: *uninstall not removing files with $ in their names *default.pdsettings is not included in the installer/uninstaller by the generate_install_makefile because it is copied over after generate script is run *the fact that every make tarbz2 is forcefully changed into make deb
This also means that when issuing make deb, it needs to be followed with a PACKAGE_TYPE=deb. (I am sure there is a better way but I just haven't had a chance to dig any further). NB: patch uses default.pdl2ork extension so that will have to be changed. Cheers! On Fri, 2010-12-17 at 09:14 -0800, Hans-Christoph Steiner wrote: > On Dec 16, 2010, at 4:11 PM, Ivica Ico Bukvic wrote: > > > On Wed, 2010-12-15 at 17:15 -0800, Jonathan Wilkes wrote: > >> Hi Ivica, > >> This may just be leftovers from a previous install: > >> When I run pd by typing in '/usr/local/bin/pd-l2ork' it works fine. > >> > >> When I run it by typing pd-l2ork, I get: > >> > >> sh: /usr/bin/pd-gui: not found > >> > >> And it just waits there until I hit <ctrl-c>. > >> > >> Any hints? > >> > >> -Jonathan > > > > Actually, it seems that the default installer in packages/linux_make/ > > folder fails to produce sane binary when building a tarbz2 rather > > than a > > deb. First of all it keeps running dpkg-shlibdeps even when running > > make > > tarbz2 as it has an if statement that changes it to deb (if deb > > package > > is present) and then it assumes that binary should be built in /usr/ > > bin > > directory rather than in /usr/local/bin. > > > > Hans, shouldn't the following code be under the package: part? > > Otherwise > > it overrides tarbz2 settings if one has dpkg-deb installed > > regardless of > > what the user has input and results in erroneous build, no? > > > > # if machine has dpkg-deb, build a Debian package > > ifeq ($(shell test -x /usr/bin/dpkg-deb && echo YES),YES) > > PACKAGE_TYPE = deb > > else > > PACKAGE_TYPE = tarbz2 > > endif > > > I recently committed some fixes to the packages/linux_make/Makefile to > fix this. Have you tried the newest version? > > .hc > > > > ---------------------------------------------------------------------------- > > You can't steal a gift. Bird gave the world his music, and if you can > hear it, you can have it. - Dizzy Gillespie > > >
--- Makefile.old 2010-12-16 19:47:46.000000000 -0500 +++ Makefile 2010-12-16 23:12:24.000000000 -0500 @@ -12,11 +12,11 @@ include $(BUILDLAYOUT_DIR)/Makefile.buildlayout # if machine has dpkg-deb, build a Debian package -ifeq ($(shell test -x /usr/bin/dpkg-deb && echo YES),YES) - PACKAGE_TYPE = deb -else - PACKAGE_TYPE = tarbz2 -endif +#ifeq ($(shell test -x /usr/bin/dpkg-deb && echo YES),YES) +# PACKAGE_TYPE = deb +#else +# PACKAGE_TYPE = tarbz2 +#endif # for command-line UNIX versions, you need to install Pd into the same # directory as $(prefix) otherwise Pd won't be able to find extra, doc, etc. @@ -77,8 +77,7 @@ package: $(PACKAGE_TYPE) -tarbz2: installer_makefile installer_readme - install -p $(packages_src)/linux_make/default.pdl2ork $(DESTDIR)$(libpddir) +tarbz2: installer_settings installer_makefile installer_readme mv $(DESTDIR)$(prefix) $(DESTDIR)$(PACKAGE_NAME) cd $(DESTDIR) && \ tar cjf $(PACKAGE_NAME).tar.bz2 $(PACKAGE_NAME) @@ -161,10 +160,12 @@ sed 's|PACKAGE_NAME|$(PACKAGE_NAME)|' $(packages_src)/linux_make/README > \ $(INSTALLER_README_FILE) +installer_settings: + install -p $(packages_src)/linux_make/default.pdl2ork $(DESTDIR)$(libpddir) installer_makefile: # it is very hard to escape the $ in shell scripts so delete files - -rm -f -- $(helpdir)/iem*/*\$$*.pd $(objectsdir)/iem*/*\$$*.pd +# -rm -f -- $(helpdir)/iem*/*\$$*.pd $(objectsdir)/iem*/*\$$*.pd # don't put the Makefile into the package yet, otherwise it'll get installed ./generate_install_makefile.bash $(DESTDIR)$(prefix) > tarbz2Makefile mv -i tarbz2Makefile $(DESTDIR)$(prefix)/Makefile
_______________________________________________ Pd-list@iem.at mailing list UNSUBSCRIBE and account-management -> http://lists.puredata.info/listinfo/pd-list
