From 09647a5d6298e5c5244b3d8e15616f95d00f6372 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Thu, 12 Jul 2007 04:02:09 +0000
Subject: 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
---
 packages/darwin_app/org.puredata.pd.plist | 18 +++++++++---------
 packages/linux_make/Makefile              |  2 ++
 packages/linux_make/default.pdsettings    |  6 ++----
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'packages')

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
-- 
cgit v1.2.1