diff options
| -rwxr-xr-x | packages/linux_make/Makefile | 5 | ||||
| -rw-r--r-- | packages/linux_make/README | 7 | ||||
| -rw-r--r-- | packages/linux_make/default.pdsettings (renamed from packages/linux_make/.pdsettings) | 0 | ||||
| -rwxr-xr-x | scripts/generate-pd-settings-files.sh | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile index ffea3013..fa23000f 100755 --- a/packages/linux_make/Makefile +++ b/packages/linux_make/Makefile @@ -88,8 +88,7 @@ deb: $(bindir) install -d $(DESTDIR)/etc/pd-extended ln -s $(prefix)/lib/pd/default.pdsettings \ $(DESTDIR)/etc/pd-extended/default.pdsettings - install -p $(packages_src)/linux_make/.pdsettings \ - $(libpddir)/default.pdsettings + install -p $(packages_src)/linux_make/default.pdsettings $(libpddir) # emacs mode for .pd files install -d $(DESTDIR)/usr/share/emacs/site-lisp/ install -p $(scripts_src)/pd-mode.el $(DESTDIR)/usr/share/emacs/site-lisp/ @@ -102,7 +101,7 @@ deb: $(bindir) fakeroot dpkg-deb --build $(DESTDIR) $(packages_src)/linux_make/$(PACKAGE_NAME).deb tarbz2: installer_makefile installer_readme - install -p .pdsettings $(DESTDIR)$(prefix) + install -p $(packages_src)/linux_make/default.pdsettings $(libpddir) mv $(DESTDIR)$(prefix) $(DESTDIR)$(PACKAGE_NAME) cd $(DESTDIR) && \ tar cjf $(PACKAGE_NAME).tar.bz2 $(PACKAGE_NAME) diff --git a/packages/linux_make/README b/packages/linux_make/README index 862b9ee9..83881c03 100644 --- a/packages/linux_make/README +++ b/packages/linux_make/README @@ -16,10 +16,9 @@ To uninstall: cd PACKAGE_NAME make uninstall -To load the default set of libraries, you need to install the .pdsettings file -included in the package (~ is your home directory): - - mv .pdsettings ~ +A preferences file is embedded into this distro. It loads the default set of +libraries, and sets a couple of other things. If you save the preferences +within Pd, it will override these embedded preferences. Installing the needed dependencies ---------------------------------- diff --git a/packages/linux_make/.pdsettings b/packages/linux_make/default.pdsettings index 42526f4e..42526f4e 100644 --- a/packages/linux_make/.pdsettings +++ b/packages/linux_make/default.pdsettings diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh index bd1bdb7c..2457f4d6 100755 --- a/scripts/generate-pd-settings-files.sh +++ b/scripts/generate-pd-settings-files.sh @@ -9,7 +9,7 @@ WINDOWS_FONTPATH="hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6 SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'` ROOT_DIR=${SCRIPT_DIR}/../packages -GNULINUX_FILE=${ROOT_DIR}/linux_make/.pdsettings +GNULINUX_FILE=${ROOT_DIR}/linux_make/default.pdsettings MACOSX_FILE=${ROOT_DIR}/darwin_app/org.puredata.pd.plist WINDOWS_FILE=${ROOT_DIR}/win32_inno/pd-settings.reg |