From 65f0b37b8dc3ef85c6e49d802b043e19679b5e3d Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Wed, 11 Jul 2007 02:32:45 +0000
Subject: renamed the included .pdsettings to default.pdsettings since it's now
 embedded into the Pd distro

svn path=/trunk/; revision=7996
---
 packages/linux_make/.pdsettings        | 44 ----------------------------------
 packages/linux_make/Makefile           |  5 ++--
 packages/linux_make/README             |  7 +++---
 packages/linux_make/default.pdsettings | 44 ++++++++++++++++++++++++++++++++++
 scripts/generate-pd-settings-files.sh  |  2 +-
 5 files changed, 50 insertions(+), 52 deletions(-)
 delete mode 100644 packages/linux_make/.pdsettings
 create mode 100644 packages/linux_make/default.pdsettings

diff --git a/packages/linux_make/.pdsettings b/packages/linux_make/.pdsettings
deleted file mode 100644
index 42526f4e..00000000
--- a/packages/linux_make/.pdsettings
+++ /dev/null
@@ -1,44 +0,0 @@
-standardpath: 1
-verbose: 0
-loadlib1: Gem
-loadlib2: cyclone
-loadlib3: zexy
-loadlib4: creb
-loadlib5: cxc
-loadlib6: ggee
-loadlib7: iemlib
-loadlib8: list-abs
-loadlib9: mapping
-loadlib10: markex
-loadlib11: maxlib
-loadlib12: memento
-loadlib13: mjlib
-loadlib14: motex
-loadlib15: oscx
-loadlib16: pddp
-loadlib17: pdogg
-loadlib18: pixeltango
-loadlib19: pmpd
-loadlib20: rradical
-loadlib21: sigpack
-loadlib22: smlib
-loadlib23: toxy
-loadlib24: unauthorized
-loadlib25: vbap
-loadlib26: pan
-loadlib27: freeverb
-loadlib28: hcs
-loadlib29: jmmmp
-loadlib30: ext13
-loadlib31: hardware
-loadlib32: deprecated
-loadlib33: flatspace
-loadlib34: iem_anything
-loadlib35: pdp
-loadlib36: pidip
-loadlib37: flib
-path1: /usr/X11R6/lib/X11/fonts
-path2: /usr/X11R6/lib/X11/fonts/TTF
-path3: /usr/lib/X11/fonts
-path4: /usr/share/fonts/truetype
-nloadlib: 37
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/default.pdsettings b/packages/linux_make/default.pdsettings
new file mode 100644
index 00000000..42526f4e
--- /dev/null
+++ b/packages/linux_make/default.pdsettings
@@ -0,0 +1,44 @@
+standardpath: 1
+verbose: 0
+loadlib1: Gem
+loadlib2: cyclone
+loadlib3: zexy
+loadlib4: creb
+loadlib5: cxc
+loadlib6: ggee
+loadlib7: iemlib
+loadlib8: list-abs
+loadlib9: mapping
+loadlib10: markex
+loadlib11: maxlib
+loadlib12: memento
+loadlib13: mjlib
+loadlib14: motex
+loadlib15: oscx
+loadlib16: pddp
+loadlib17: pdogg
+loadlib18: pixeltango
+loadlib19: pmpd
+loadlib20: rradical
+loadlib21: sigpack
+loadlib22: smlib
+loadlib23: toxy
+loadlib24: unauthorized
+loadlib25: vbap
+loadlib26: pan
+loadlib27: freeverb
+loadlib28: hcs
+loadlib29: jmmmp
+loadlib30: ext13
+loadlib31: hardware
+loadlib32: deprecated
+loadlib33: flatspace
+loadlib34: iem_anything
+loadlib35: pdp
+loadlib36: pidip
+loadlib37: flib
+path1: /usr/X11R6/lib/X11/fonts
+path2: /usr/X11R6/lib/X11/fonts/TTF
+path3: /usr/lib/X11/fonts
+path4: /usr/share/fonts/truetype
+nloadlib: 37
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
 
-- 
cgit v1.2.1