From 62d3d94cc33ef707139c3b8bb50e4475a9d77e77 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Tue, 22 Feb 2011 03:48:16 +0000
Subject: removed libdir since its in 'startup' and added vanilla/list since it
 must be pre-loaded to work

svn path=/trunk/; revision=14943
---
 packages/darwin_app/org.puredata.pdextended.default.plist | 4 ++--
 packages/linux_make/default.pdextended                    | 2 +-
 packages/win32_inno/pd-extended.bat                       | 2 +-
 packages/win32_inno/pd-inno.iss.in                        | 2 +-
 packages/win32_inno/pd-settings.reg                       | 2 +-
 scripts/generate-pd-settings-files.sh                     | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/darwin_app/org.puredata.pdextended.default.plist b/packages/darwin_app/org.puredata.pdextended.default.plist
index 176d29fa..66e45de8 100644
--- a/packages/darwin_app/org.puredata.pdextended.default.plist
+++ b/packages/darwin_app/org.puredata.pdextended.default.plist
@@ -5,9 +5,9 @@
 	<key>defeatrt</key>
 	<string>0</string>
 	<key>flags</key>
-	<string>-helppath ~/Library/Pd -helppath /Library/Pd</string>
+	<string></string>
 	<key>loadlib1</key>
-	<string>libdir</string>
+	<string>vanilla/list</string>
 	<key>loadlib2</key>
 	<string>vanilla</string>
 	<key>loadlib3</key>
diff --git a/packages/linux_make/default.pdextended b/packages/linux_make/default.pdextended
index 190b1219..b4f3a19c 100644
--- a/packages/linux_make/default.pdextended
+++ b/packages/linux_make/default.pdextended
@@ -2,7 +2,7 @@ standardpath: 1
 verbose: 0
 defeatrt: 0
 flags:
-loadlib1: libdir
+loadlib1: vanilla/list
 loadlib2: vanilla
 loadlib3: extra
 loadlib4: Gem
diff --git a/packages/win32_inno/pd-extended.bat b/packages/win32_inno/pd-extended.bat
index 41457372..153acacc 100644
--- a/packages/win32_inno/pd-extended.bat
+++ b/packages/win32_inno/pd-extended.bat
@@ -1 +1 @@
-bin\pd.exe  -lib libdir -lib vanilla -lib extra -lib Gem -lib cyclone -lib zexy
+bin\pd.exe  -lib vanilla/list -lib vanilla -lib extra -lib Gem -lib cyclone -lib zexy
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index d297a2b2..2e9e6c34 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -80,7 +80,7 @@ Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData:
 ; STARTHERE: add pd-inno_registry after this comment:
 
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: flags; ValueData: ; Tasks: libs; Flags: uninsdeletekey
-Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs
+Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib1; ValueData: vanilla/list; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib2; ValueData: vanilla; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib3; ValueData: extra; Tasks: libs
 Root: HKLM; SubKey: SOFTWARE\Pd-extended; ValueType: string; ValueName: loadlib4; ValueData: Gem; Tasks: libs
diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index bc2be999..d9794a2f 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -2,7 +2,7 @@ Windows Registry Editor Version 5.00
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Pd-extended]
 "flags"=""
-"loadlib1"="libdir"
+"loadlib1"="vanilla/list"
 "loadlib2"="vanilla"
 "loadlib3"="extra"
 "loadlib4"="Gem"
diff --git a/scripts/generate-pd-settings-files.sh b/scripts/generate-pd-settings-files.sh
index 1c1a6fe7..2777bce6 100755
--- a/scripts/generate-pd-settings-files.sh
+++ b/scripts/generate-pd-settings-files.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ECHO=/sw/bin/echo
-LIBS="libdir vanilla extra Gem cyclone zexy"
+LIBS="vanilla/list vanilla extra Gem cyclone zexy"
 
 GNULINUX_FONTPATH="/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
 MACOSX_FONTPATH="/System/Library/Fonts /Library/Fonts ~/Library/Fonts /usr/X11R6/lib/X11/fonts/TTF /System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home/lib/fonts"
@@ -26,7 +26,7 @@ WINDOWS_INNO_REG_FILE=${ROOT_DIR}/win32_inno/pd-inno.registry.reg
 GNULINUX_HEADER='standardpath: 1\nverbose: 0\ndefeatrt: 0\nflags:'
 
 
-MACOSX_HEADER='<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n\t<key>defeatrt</key>\n\t<string>0</string>\n\t<key>flags</key>\n\t<string>-helppath ~/Library/Pd -helppath /Library/Pd</string>'
+MACOSX_HEADER='<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n<plist version="1.0">\n<dict>\n\t<key>defeatrt</key>\n\t<string>0</string>\n\t<key>flags</key>\n\t<string></string>'
 MACOSX_FOOTER='</dict>\n
 </plist>\n'
 
-- 
cgit v1.2.1