added standard locations to the path for putting your own pd libs for GNU/Linux and Mac OS X (where should this go on Windows?); simplified GNU/Linux font path

svn path=/trunk/; revision=8037

4 files changed, 15 insertions, 15 deletions

diff --git a/packages/darwin_app/org.puredata.pd.plist b/packages/darwin_app/org.puredata.pd.plist
index 9d649396..9c9167d0 100644
--- a/packages/darwin_app/org.puredata.pd.plist
+++ b/packages/darwin_app/org.puredata.pd.plist
@@ -81,23 +81,23 @@
 	<key>loadlib37</key>
 	<string>flib</string>
 	<key>path1</key>
-	<string>/System/Library/Fonts</string>
+	<string>/Library/Pd</string>
 	<key>path2</key>
-	<string>/Library/Fonts</string>
+	<string>/System/Library/Fonts</string>
 	<key>path3</key>
-	<string>~/Library/Fonts</string>
+	<string>/Library/Fonts</string>
 	<key>path4</key>
-	<string>/usr/X11R6/lib/X11/fonts/TTF</string>
+	<string>~/Library/Fonts</string>
 	<key>path5</key>
-	<string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string>
+	<string>/usr/X11R6/lib/X11/fonts/TTF</string>
 	<key>path6</key>
-	<string>/sw/lib/X11/fonts/msttf</string>
+	<string>/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts</string>
 	<key>path7</key>
-	<string>/sw/lib/X11/fonts/intl/TrueType</string>
+	<string>/sw/lib/X11/fonts/msttf</string>
 	<key>path8</key>
-	<string>/sw/lib/X11/fonts/applettf</string>
+	<string>/sw/lib/X11/fonts/intl/TrueType</string>
 	<key>path9</key>
-	<string>/sw/lib/X11/fonts/msttf</string>
+	<string>/sw/lib/X11/fonts/applettf</string>
 </dict>
  </plist>
 
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index fa23000f..f9972ce6 100755
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -89,6 +89,8 @@ deb: $(bindir)
 	ln -s $(prefix)/lib/pd/default.pdsettings \
 		$(DESTDIR)/etc/pd-extended/default.pdsettings
 	install -p $(packages_src)/linux_make/default.pdsettings $(libpddir)
+# folder to install libs into
+	install -d -m0775 $(DESTDIR)/usr/share/pd
 # 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/
diff --git a/packages/linux_make/default.pdsettings b/packages/linux_make/default.pdsettings
index 42526f4e..5e26d079 100644
--- a/packages/linux_make/default.pdsettings
+++ b/packages/linux_make/default.pdsettings
@@ -37,8 +37,6 @@ 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
+path1: /usr/share/pd
+path2: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
 nloadlib: 37
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index 67eaa350..85f426e9 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -2,8 +2,8 @@
 
 LIBS="Gem cyclone zexy creb cxc ggee iemlib list-abs mapping markex maxlib memento mjlib motex oscx pddp pdogg pixeltango pmpd rradical sigpack smlib toxy unauthorized vbap pan freeverb hcs jmmmp ext13 hardware deprecated flatspace iem_anything pdp pidip flib"
 
-GNULINUX_FONTPATH="/usr/X11R6/lib/X11/fonts /usr/X11R6/lib/X11/fonts/TTF /usr/lib/X11/fonts /usr/share/fonts/truetype"
-MACOSX_FONTPATH="/System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts /sw/lib/X11/fonts/msttf /sw/lib/X11/fonts/intl/TrueType /sw/lib/X11/fonts/applettf /sw/lib/X11/fonts/msttf"
+GNULINUX_FONTPATH="/usr/share/pd /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
+MACOSX_FONTPATH="/Library/Pd /System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts /sw/lib/X11/fonts/msttf /sw/lib/X11/fonts/intl/TrueType /sw/lib/X11/fonts/applettf"
 WINDOWS_FONTPATH="hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00"
 
 SCRIPT_DIR=`echo $0 | sed 's|\(.*\)/.*$|\1|'`