merged in relevant changes from the v0-40 pd-extended release branch

svn path=/trunk/; revision=10266

15 files changed, 117 insertions, 79 deletions

diff --git a/externals/Makefile b/externals/Makefile
index ecd10c6d..0cb85997 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -135,10 +135,10 @@ ifeq ($(OS_NAME),windows)
   LIB_TARGETS += 
 else
   ifeq ($(OS_NAME),darwin)
-    LIB_TARGETS += hid pdp pidip gem2pdp aka.wiiremote iem16 apple
+    LIB_TARGETS += hid pdp pidip gem2pdp iem16 apple pdp_opengl
   else
     # GNU/Linux, BSD, IRIX, etc.
-    LIB_TARGETS += hid pdp pidip gem2pdp hdspm_mixer iem16 postlude tclpd pdvjtools sixaxis
+    LIB_TARGETS += hid pdp pidip gem2pdp hdspm_mixer iem16 postlude tclpd pdvjtools sixaxis pdp_opengl
   endif
 endif
 
@@ -418,7 +418,6 @@ boids_clean:
 #------------------------------------------------------------------------------#
 # BSAYLOR
 BSAYLOR_NAME=bsaylor
-# partconv~.c requires fftw3, which is not part of the build system yet
 BSAYLOR_OBJECTS := $(wildcard $(externals_src)/bsaylor/*~.c)
 bsaylor: $(BSAYLOR_OBJECTS:.c=.$(EXTENSION))
 
@@ -433,6 +432,7 @@ bsaylor_install: bsaylor
 	install -d $(helpdir)/$(BSAYLOR_NAME)
 	install -p $(externals_src)/bsaylor/help/*.pd \
 		$(helpdir)/$(BSAYLOR_NAME)
+	install -p $(externals_src)/bsaylor/*.wav $(helpdir)/$(BSAYLOR_NAME)
 #	install -d $(manualsdir)/$(BSAYLOR_NAME)
 	install -d $(readmesdir)
 	install -p $(externals_src)/bsaylor/README.txt \
@@ -488,17 +488,15 @@ corelibs_clean:
 #------------------------------------------------------------------------------#
 # CREB
 CREB_NAME=creb
-# ead* are compiled separately
 CREB_OBJECTS := $(wildcard $(externals_src)/creb/modules/*.c)
-# loopsampler.cc doesn't compile, so omit
-CREB_CXXOBJECTS := $(wildcard $(externals_src)/creb/modules++/[a-km-z]*.cc)
+CREB_CXXOBJECTS := $(wildcard $(externals_src)/creb/modules++/*.cc)
 
 creb: $(CREB_OBJECTS:.c=.$(EXTENSION)) $(CREB_CXXOBJECTS:.cc=.$(EXTENSION))
 
 creb_install: creb
 	install -d $(objectsdir)/$(CREB_NAME)
 	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(CREB_NAME) \
-		--author "Tom Schouten <creb@zzz.kotnet.org>" \
+		--author "Tom Schouten <tom@zwizwa.be>" \
 		--description "This is a collection of pd externals. My bag of tricks." \
 		--license "GNU GPL 2" \
 		--version "0.9.2"
@@ -507,17 +505,17 @@ creb_install: creb
 		$(CREB_CXXOBJECTS:.cc=.$(EXTENSION)) 		$(objectsdir)/$(CREB_NAME)
 	install -d $(helpdir)/$(CREB_NAME)
 	install -p $(externals_src)/creb/doc/*.* $(helpdir)/$(CREB_NAME)
-	install -d $(manualsdir)/$(CREB_NAME)
-	install -p $(externals_src)/creb/doc/reference.txt $(manualsdir)/$(CREB_NAME)
+	install -d $(readmesdir)
+	install -p $(externals_src)/creb/doc/reference.txt \
+		$(readmesdir)/$(CREB_NAME).txt
 	install -d $(examplesdir)/$(CREB_NAME)
 	install -p $(externals_src)/creb/doc/examples/*.* $(examplesdir)/$(CREB_NAME)
 
 creb_clean:
 	-rm -f -- $(CREB_OBJECTS:.c=.$(EXTENSION))
-	-rm -f -- $(CREB_ENVELOPE_UTIL:.c=.$(EXTENSION))
-	-rm -f -- $(CREB_EA_OBJECTS:.c=.$(EXTENSION)) 
 	-rm -f -- $(CREB_OBJECTS:.c=.o)
-	-rm -f -- $(CREB_ENVELOPE_UTIL:.c=.o) $(CREB_EA_OBJECTS:.c=.o)
+	-rm -f -- $(CREB_CXXOBJECTS:.cc=.$(EXTENSION))
+	-rm -f -- $(CREB_CXXOBJECTS:.cc=.o)
 	-rm -f -- $(externals_src)/creb/*/*.bak
 	-rm -f -- $(externals_src)/creb/*/*.*~
 
@@ -1011,7 +1009,6 @@ hardware_install: hardware
 #	install -p $(HARDWARE_OBJECTS:.c=.$(EXTENSION)) \
 #		$(objectsdir)/$(HARDWARE_NAME)
 	install -p $(externals_src)/hardware/lanbox/lanbox.pd \
-		$(externals_src)/hardware/arduino/arduino.pd \
 		$(objectsdir)/$(HARDWARE_NAME)
 	install -d $(helpdir)/$(HARDWARE_NAME)
 	install -p $(externals_src)/hardware/*/*-help.pd \
@@ -1023,9 +1020,8 @@ hardware_install: hardware
 	install -p $(externals_src)/hardware/README.txt \
 		$(readmesdir)/$(HARDWARE_NAME).txt
 	install -d $(examplesdir)/$(HARDWARE_NAME)
-	install -p $(externals_src)/hardware/*/examples/*.pd \
-		$(externals_src)/hardware/arduino/arduino-test.pd \
-		$(examplesdir)/$(HARDWARE_NAME)
+#	install -p $(externals_src)/hardware/*/examples/*.pd \
+#		$(examplesdir)/$(HARDWARE_NAME)
 
 hardware_clean:
 	-rm -f -- $(externals_src)/hardware/*/*.$(EXTENSION)
@@ -1048,10 +1044,6 @@ hcs_install: hcs
 		--license "GNU GPL" \
 		--version ""
 	install -p $(HCS_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(HCS_NAME)
-# temp kludge: install [classpath] and [import] into global namespace since
-# they are used for loading libraries
-	install -p $(externals_src)/hcs/classpath.$(EXTENSION) \
-		$(externals_src)/hcs/import.$(EXTENSION) $(objectsdir)
 	install -p $(shell ls -1 $(externals_src)/hcs/*.pd | \
 			 grep -v '\-help.pd') $(objectsdir)/$(HCS_NAME)
 # hmm, these don't have a home yet...
@@ -1059,9 +1051,9 @@ hcs_install: hcs
 	install -d $(helpdir)/$(HCS_NAME)
 	install -p $(externals_src)/hcs/*-help.pd \
 		$(helpdir)/$(HCS_NAME)
-	install -d $(manualsdir)/$(HCS_NAME)
-	install -p $(externals_src)/hcs/README* $(externals_src)/hcs/TODO \
-		$(manualsdir)/$(HCS_NAME)
+#	install -d $(manualsdir)/$(HCS_NAME)
+#	install -p $(externals_src)/hcs/README* $(externals_src)/hcs/TODO \
+#		$(manualsdir)/$(HCS_NAME)
 #	install -d $(readmesdir)
 #	install -p $(externals_src)/hcs/README \
 #		$(readmesdir)/$(HCS_NAME).txt
@@ -1308,7 +1300,7 @@ iem_bin_ambi_install: iem_bin_ambi
 	install -d $(helpdir)/$(IEM_BIN_AMBI_NAME)
 	install -p $(externals_src)/iem/iem_bin_ambi/help/*.pd \
 		$(helpdir)/$(IEM_BIN_AMBI_NAME)
-	install -d $(manualsdir)/$(IEM_BIN_AMBI_NAME)
+#	install -d $(manualsdir)/$(IEM_BIN_AMBI_NAME)
 	install -d $(readmesdir)
 	install -p $(externals_src)/iem/iem_bin_ambi/READ_ME.txt \
 		$(readmesdir)/$(IEM_BIN_AMBI_NAME).txt
@@ -1526,9 +1518,10 @@ jasch_lib_clean:
 #------------------------------------------------------------------------------#
 # LOADERS
 LOADERS_NAME=
-LOADERS_OBJECTS := $(wildcard $(externals_src)/loaders/*.c)
+LOADERS_OBJECTS := $(wildcard $(externals_src)/loaders/*.c)  \
+	$(externals_src)/loaders/hexloader/hexloader.c
 loaders: $(LOADERS_OBJECTS:.c=.$(EXTENSION))
-
+	echo $(LOADERS_OBJECTS)
 loaders_install: loaders
 	install -d $(objectsdir)/$(LOADERS_NAME)
 	install -p $(LOADERS_OBJECTS:.c=.$(EXTENSION)) $(objectsdir)/$(LOADERS_NAME)
@@ -1539,7 +1532,7 @@ loaders_install: loaders
 #	install -p $(externals_src)/loaders/README.txt $(manualsdir)/$(LOADERS_NAME)
 
 loaders_clean:
-	-rm -f -- $(externals_src)/loaders/*.$(EXTENSION)
+	-rm -f -- $(LOADERS_OBJECTS:.c=.$(EXTENSION))
 	-rm -f -- $(externals_src)/loaders/*.o
 	-rm -f -- $(externals_src)/loaders/*.bak
 	-rm -f -- $(externals_src)/loaders/*.*~
@@ -1743,7 +1736,7 @@ moonlib_install: moonlib
 	install -d $(readmesdir)
 	install -p $(externals_src)/moonlib/README.txt \
 		$(readmesdir)/$(MOONLIB_NAME).txt
-	install -d $(examplesdir)/$(MOONLIB_NAME)
+#	install -d $(examplesdir)/$(MOONLIB_NAME)
 #	install -p $(externals_src)/moonlib/examples/*.pd \
 #		$(examplesdir)/$(MOONLIB_NAME)
 
@@ -2074,7 +2067,8 @@ pdp_install: pdp
 	install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir)
 #	install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)/$(PDP_NAME)
 	install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)
-#	install -d $(helpdir)/$(PDP_NAME)
+	install -d $(helpdir)/$(PDP_NAME)
+	install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)/$(PDP_NAME)
 	install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)
 	install -d $(manualsdir)/$(PDP_NAME)
 	install -p $(externals_src)/pdp/doc/reference.txt $(manualsdir)/$(PDP_NAME)
@@ -2092,6 +2086,42 @@ pdp_clean:
 	-rm -f -- $(externals_src)/pdp/configure
 
 
+#------------------------------------------------------------------------------#
+# PDP_OPENGL
+PDP_OPENGL_NAME=3dp
+PDP_OPENGL_BINARY := $(externals_src)/pdp/opengl/pdp_opengl.$(EXTENSION)
+$(PDP_OPENGL_BINARY): $(externals_src)/pdp/Makefile.config
+	make -C $(externals_src)/pdp/opengl
+
+pdp_opengl: $(PDP_OPENGL_BINARY)
+	echo $(PDP_OPENGL_BINARY)
+
+pdp_opengl_install: pdp_opengl
+	install -d $(objectsdir)/$(PDP_OPENGL_NAME)
+	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PDP_OPENGL_NAME) \
+		--author "Tom Schouten" \
+		--description "opengl extensions for pdp" \
+		--license "GPL v2 or later"
+	install -p $(PDP_OPENGL_BINARY) $(objectsdir)
+	install -p $(externals_src)/pdp/opengl/abstractions/*.pd \
+		$(objectsdir)/$(PDP_OPENGL_NAME)
+	install -d $(helpdir)
+	install -p $(externals_src)/pdp/opengl/doc/objects/*.pd $(helpdir)
+	install -d $(readmesdir)
+	install -p $(externals_src)/pdp/opengl/README \
+		$(readmesdir)/$(PDP_OPENGL_NAME).txt
+	install -d $(examplesdir)/$(PDP_OPENGL_NAME)
+	install -p $(externals_src)/pdp/opengl/doc/examples/*.pd \
+		$(examplesdir)/$(PDP_OPENGL_NAME)
+	install -p $(externals_src)/pdp/opengl/test/*.pd \
+		$(examplesdir)/$(PDP_OPENGL_NAME)
+
+pdp_opengl_clean:
+	make -C $(externals_src)/pdp/opengl clean
+	-rm -f -- $(PDP_OPENGL_BINARY)
+	-rm -f -- $(externals_src)/pdp_opengl/*.bak
+	-rm -f -- $(externals_src)/pdp_opengl/*.*~
+
 
 #------------------------------------------------------------------------------#
 # PDVJTOOLS
@@ -2158,7 +2188,8 @@ pidip_install: pidip
 #		--license "GNU GPLv2"
 	install -d $(objectsdir)
 	install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir)
-	install -d $(helpdir)
+	install -d $(helpdir)/$(PIDIP_NAME)
+	install -p $(externals_src)/pidip/doc/*.pd $(helpdir)/$(PIDIP_NAME)
 	install -p $(externals_src)/pidip/doc/*.pd $(helpdir)
 	install -d $(examplesdir)/$(PIDIP_NAME)
 	install -p $(externals_src)/pidip/patches/*.* $(examplesdir)/$(PIDIP_NAME)
@@ -2986,7 +3017,6 @@ flashserver_install: flashserver
 	install -d $(readmesdir)
 	install -p $(externals_src)/olafmatt/flashserver/README \
 		$(readmesdir)/$(FLASHSERVER_NAME).txt
-	install -d $(examplesdir)/$(FLASHSERVER_NAME)
 
 flashserver_clean:
 	-rm -f -- $(FLASHSERVER_OBJECTS:.c=.$(EXTENSION))
@@ -3142,9 +3172,6 @@ earplug_install: earplug
 	install -d $(helpdir)/$(EARPLUG_NAME)
 	install -p $(externals_src)/earplug~/*-help.pd \
 		$(helpdir)/$(EARPLUG_NAME)
-	install -d $(examplesdir)/$(EARPLUG_NAME)
-	install -p $(externals_src)/earplug~/*-help.pd \
-		   $(examplesdir)/$(EARPLUG_NAME)
 
 earplug_clean:
 	-rm -f -- $(EARPLUG_OBJECTS:.c=.$(EXTENSION))
@@ -3163,6 +3190,28 @@ earplug_clean:
 # make the symlinks necessary to simulate the installed environment
 devsymlinks: 
 
+TAGS: etags
+
+etags:
+	etags $(pd_src)/src/*.[ch] 
+	find $(externals_src) -type f -name '*.[ch]' -exec etags -a '{}' \;
+	find $(externals_src) -type f -name '*.cc' -exec etags -a '{}' \;
+	find $(externals_src) -type f -name '*.cpp' -exec etags -a '{}' \;
+	find $(extensions_src) -type f -name '*.[ch]' -exec etags -a '{}' \;
+	find /usr/include -type f -name \*.h -exec etags -a '{}' \;
+	make etags_`uname -s`
+
+etags_Darwin:
+	etags -a $(externals_src)/hcs/hid/HID\ Utilities\ Source/*.[ch]
+	find /System/Library/Frameworks  -type f -name \*.h -exec etags -a '{}' \;
+	find /Library/Frameworks  -type f -name \*.h -exec etags -a '{}' \;
+	find /sw/include -type f -name \*.h -exec etags -a '{}' \;
+
+etags_Linux:
+
+etags_MINGW:
+	find /usr/local/include/ -type f -name \*.h -exec etags -a '{}' \;
+
 
 #==============================================================================#
 #
diff --git a/externals/build/src/any2list.c b/externals/build/src/any2list.c
new file mode 100644
index 00000000..cf9a1b56
--- /dev/null
+++ b/externals/build/src/any2list.c
@@ -0,0 +1 @@
+#include "../../zexy/src/a2l.c"
diff --git a/externals/build/src/demux.c b/externals/build/src/demux.c
new file mode 100644
index 00000000..0e289a33
--- /dev/null
+++ b/externals/build/src/demux.c
@@ -0,0 +1 @@
+#include "../../zexy/src/demultiplex.c"
diff --git a/externals/build/src/demux~.c b/externals/build/src/demux~.c
new file mode 100644
index 00000000..77eea53f
--- /dev/null
+++ b/externals/build/src/demux~.c
@@ -0,0 +1 @@
+#include "../../zexy/src/demultiplex~.c"
diff --git a/externals/build/src/ibfft~.c b/externals/build/src/ibfft~.c
deleted file mode 100644
index 56412aa1..00000000
--- a/externals/build/src/ibfft~.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* 
- * hack to work around my lack of Windows linking knowledge
- * <hans@at.or.at>
- */
-#ifdef WIN32
-#include "../../../pd/src/d_fft_mayer.c"
-#endif
-
-#include "../../creb/modules/bfft~.c"
diff --git a/externals/build/src/idwt~.c b/externals/build/src/idwt~.c
deleted file mode 100644
index 93446436..00000000
--- a/externals/build/src/idwt~.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../creb/modules/dwt~.c"
diff --git a/externals/build/src/l.c b/externals/build/src/l.c
new file mode 100644
index 00000000..3b160767
--- /dev/null
+++ b/externals/build/src/l.c
@@ -0,0 +1 @@
+#include "../../zexy/src/lister.c"
diff --git a/externals/build/src/l2i.c b/externals/build/src/l2i.c
new file mode 100644
index 00000000..b011001a
--- /dev/null
+++ b/externals/build/src/l2i.c
@@ -0,0 +1 @@
+#include "../../zexy/src/list2int.c"
diff --git a/externals/build/src/l2s.c b/externals/build/src/l2s.c
new file mode 100644
index 00000000..7f22b2e5
--- /dev/null
+++ b/externals/build/src/l2s.c
@@ -0,0 +1 @@
+#include "../../zexy/src/list2symbol.c"
diff --git a/externals/build/src/mux.c b/externals/build/src/mux.c
new file mode 100644
index 00000000..9a3a02fb
--- /dev/null
+++ b/externals/build/src/mux.c
@@ -0,0 +1 @@
+#include "../../zexy/src/multiplex.c"
diff --git a/externals/build/src/mux~.c b/externals/build/src/mux~.c
new file mode 100644
index 00000000..18c83d71
--- /dev/null
+++ b/externals/build/src/mux~.c
@@ -0,0 +1 @@
+#include "../../zexy/src/multiplex~.c"
diff --git a/externals/build/src/s2l.c b/externals/build/src/s2l.c
new file mode 100644
index 00000000..4a0f9ee1
--- /dev/null
+++ b/externals/build/src/s2l.c
@@ -0,0 +1 @@
+#include "../../zexy/src/symbol2list.c"
diff --git a/externals/deprecated/help/linuxevent-help.pd b/externals/deprecated/help/linuxevent-help.pd
index 2cd51b8f..99f23570 100644
--- a/externals/deprecated/help/linuxevent-help.pd
+++ b/externals/deprecated/help/linuxevent-help.pd
@@ -244,7 +244,7 @@ Devices \, like mice \, joysticks \, tablets \, etc.;
 #X floatatom 220 493 3 0 0 3 hat-Y - -;
 #X floatatom 124 493 5 0 0 3 twist - -;
 #X floatatom 263 492 5 0 0 3 throttle - -;
-#X obj 418 567 pddp_open all_about_hid;
+#X obj 418 567 pddp/pddplink ../all_about_hid.pd -text all_about_hid;
 #X text 309 566 for more info:;
 #X text 13 554 detailed info:;
 #X text 14 605 by Hans-Christoph Steiner <hans@at.or.at>;
diff --git a/externals/deprecated/help/linuxmouse-help.pd b/externals/deprecated/help/linuxmouse-help.pd
index aceadc37..761db0fc 100644
--- a/externals/deprecated/help/linuxmouse-help.pd
+++ b/externals/deprecated/help/linuxmouse-help.pd
@@ -24,7 +24,7 @@ screen size.;
 #X msg 419 10 pddp;
 #X text 178 417 For more info on HIDs:;
 #X text 10 441 by Hans-Christoph Steiner <hans@at.or.at>;
-#X obj 340 417 pddp_open all_about_hid;
+#X obj 340 417 pddp/pddplink ../all_about_hid.pd -text all_about_hid;
 #X text 24 325 Rather than polling like the other HID objects \, [linuxmouse]
 uses a pollfn so it receives events as they happen. A pollfn listens
 to a network socket \, and takes action upon activity. Since all mouse
diff --git a/externals/loaders/libdir.c b/externals/loaders/libdir.c
index 35ea35d1..bcb465b9 100644
--- a/externals/loaders/libdir.c
+++ b/externals/loaders/libdir.c
@@ -40,15 +40,15 @@ static int libdir_loader(t_canvas *canvas, char *classname)
 {
     int fd = -1;
     unsigned int i;
-    char helppathname[MAXPDSTRING];
-    char fullclassname[MAXPDSTRING], dirbuf[MAXPDSTRING];
-    char reldirbuf[MAXPDSTRING], curdir[MAXPDSTRING], *nameptr;
+    char helppathname[FILENAME_MAX];
+    char fullclassname[FILENAME_MAX], dirbuf[FILENAME_MAX], pathbuf[FILENAME_MAX];
+    char *nameptr;
     t_canvasenvironment *canvasenvironment;
 
 /* look for meta file (classname)/(classname)-meta.pd */
-    strncpy(fullclassname, classname, MAXPDSTRING - 6);
+    strncpy(fullclassname, classname, FILENAME_MAX - 6);
     strcat(fullclassname, "/");
-    strncat(fullclassname, classname, MAXPDSTRING - strlen(fullclassname) - 6);
+    strncat(fullclassname, classname, FILENAME_MAX - strlen(fullclassname) - 6);
     strcat(fullclassname, "-meta");
     
     /* if this is being called from a canvas, then add the library path to the
@@ -57,55 +57,45 @@ static int libdir_loader(t_canvas *canvas, char *classname)
     if(canvas) 
     {
         canvasenvironment = canvas_getenv(canvas);
-        if ((fd = canvas_open(0, fullclassname, ".pd",
-                                dirbuf, &nameptr, MAXPDSTRING, 0)) < 0) 
+        /* setting the canvas to NULL causes it to ignore any canvas-local path */
+        if ((fd = canvas_open(NULL, fullclassname, ".pd",
+                              dirbuf, &nameptr, FILENAME_MAX, 0)) < 0) 
         {
             return (0);
         }
         close(fd);
-
-
-        // G.Holzmann: canvas will look to a relative path to it, so we cannot add
-                // the absulote dirbuf path, we have to make it relative to the current canvas
-        // (see from line 1561 in g_canvas.c)
-
-        sys_unbashfilename(canvas_getdir(canvas)->s_name, curdir);
-        
-        // count depth of the current dir
-        for(i=0; i<strlen(curdir); i++)
-        {
-            if(curdir[i] == 47) // 47 is "/" in ascii
-                          strncat(reldirbuf, "../", MAXPDSTRING);
-        }
-        strncat(reldirbuf, dirbuf, MAXPDSTRING);
-
-
-        // TODO: have this add to the canvas-local path only
+        /* add Pd's base path to the path to make it an absolute path.  This
+         * needs to be an absolute path because relative paths in the ce_path
+         * are interpreted as relative to the parent path's current
+         * directory. hans@eds.org */
+        sys_unbashfilename(sys_libdir->s_name, pathbuf);
+        strcat(pathbuf, "/extra/");
+        strncat(pathbuf, classname, FILENAME_MAX - strlen(pathbuf));
         canvasenvironment->ce_path = namelist_append(canvasenvironment->ce_path, 
-                                reldirbuf, 0);
-        post("libdir_loader: added %s to the canvas-local path", classname);
+                                                     pathbuf, 0);
+        post("libdir_loader: added '%s' to the canvas-local objectclass path", classname);
     }
     else
 #endif
     {
         if ((fd = open_via_path(".", fullclassname, ".pd",
-                                dirbuf, &nameptr, MAXPDSTRING, 0)) < 0) 
+                                dirbuf, &nameptr, FILENAME_MAX, 0)) < 0) 
         {
             return (0);
         }
         close(fd);
         sys_searchpath = namelist_append(sys_searchpath, dirbuf, 0);
-        strncpy(helppathname, sys_libdir->s_name, MAXPDSTRING-30);
-        helppathname[MAXPDSTRING-30] = 0;
+        strncpy(helppathname, sys_libdir->s_name, FILENAME_MAX-30);
+        helppathname[FILENAME_MAX-30] = 0;
         strcat(helppathname, "/doc/5.reference/");
         strcat(helppathname, classname);
         sys_helppath = namelist_append(sys_helppath, helppathname, 0);
-        post("libdir_loader: added %s to the global classpath", classname);
+        post("libdir_loader: added '%s' to the global objectclass path", classname);
 //        post("\tThis is deprecated behavior.");
     }
     /* post("libdir_loader loaded fullclassname: '%s'\n", fullclassname); */
     if (sys_verbose) 
-        post("Loaded libdir %s from %s", classname, dirbuf);
+        post("Loaded libdir '%s' from '%s'", classname, dirbuf);
 
     return (1);
 }
@@ -116,7 +106,7 @@ void libdir_setup(void)
 #if (PD_MINOR_VERSION >= 40)
     sys_register_loader(libdir_loader);
 #else
-    error("to function, this needs to be compiled against Pd 0.40 or higher,\n");
+    error("ERROR: to function, libdir needs to be compiled against Pd 0.40 or higher,\n");
     post("\tor a version that has sys_register_loader()");
 #endif
     post("libdir loader %s",version);