lots of build bug fixes and additions, including pixeltango and lots of binary files, including many flext externals. this will probably be pd-0.38.4-extended-RC5

svn path=/trunk/; revision=4051

16 files changed, 324 insertions, 259 deletions

diff --git a/externals/Makefile b/externals/Makefile
index c9b8793d..5fcee3ba 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -59,7 +59,8 @@ pre_all_unknown:
 # INSTALL
 install: all $(objectsdir) help_install objects_install unfiltered_install \
  creb_install cyclone_install iemabs_install iemabs_install iemmatrix_install \
- pddp_install pdp_install pmpd_install toxy_install vbap_install zexy_install
+ pddp_install pdp_install pmpd_install toxy_install unauthorized_install \
+	vbap_install zexy_install
 	@echo " "
 	@echo "externals install succeeded!"
 
@@ -197,8 +198,8 @@ cyclone_install: cyclone
 		install -p *.* $(helpdir)/$(CYCLONE_NAME)
 #	install -d $(manualsdir)/$(CYCLONE_NAME)
 	install -d $(examplesdir)/$(CYCLONE_NAME)
-	install -p $(externals_src)/miXed/test/cyclone/*.*  \
-		$(examplesdir)/$(CYCLONE_NAME)
+	cd $(externals_src)/miXed/test/cyclone && \
+		install -p *.* $(examplesdir)/$(CYCLONE_NAME)
 
 
 
@@ -215,11 +216,12 @@ iemabs_install: iemabs
 	install -d $(objectsdir)/$(IEMABS_NAME)
 	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(IEMABS_NAME) \
 		--description "a collection of objects written at IEM/KUG"
-	install -p $(shell ls -1 $(externals_src)/iemlib/iemabs/*.pd | grep -v 'help') \
-		$(objectsdir)/$(IEMABS_NAME)
+	cd $(externals_src)/iemlib/iemabs/ && \
+		install -p $(shell cd $(externals_src)/iemlib/iemabs/ && ls -1 *.pd | \
+			grep -v 'help') $(objectsdir)/$(IEMABS_NAME)
 	install -d $(helpdir)/$(IEMABS_NAME)
-	install -p $(externals_src)/iemlib/iemabs/*help*.pd \
-		$(helpdir)/$(IEMABS_NAME)
+	cd $(externals_src)/iemlib/iemabs/ && \
+		install -p *help*.pd $(helpdir)/$(IEMABS_NAME)
 	install -p $(externals_src)/iemlib/iemabs/*.mp3 $(helpdir)/$(IEMABS_NAME)
 	install -p $(externals_src)/iemlib/iemabs/*.wav $(helpdir)/$(IEMABS_NAME)
 	install -d $(manualsdir)/$(IEMABS_NAME)
@@ -297,13 +299,16 @@ pdp:
 #TODO: compile gem2pdp here
 
 pdp_install: pdp
-#	install -d $(objectsdir)/$(PDP_NAME)
-#	install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir)
-#	install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir)
-#	install -p $(externals_src)/gem2pdp/*.$(EXTENSION) $(objectsdir)
-	install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)
-#	install -d $(helpdir)/$(PDP_NAME)
-	install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)
+	install -d $(objectsdir)/$(PDP_NAME)
+	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PDP_NAME) \
+		--author "Tom Schouten" \
+		--description "Pure Data Packet" \
+		--license "GNU GPL"
+	-install -p $(externals_src)/pdp/*.$(EXTENSION) $(objectsdir)/$(PDP_NAME)
+	-install -p $(externals_src)/gem2pdp/*.$(EXTENSION) $(objectsdir)/$(PDP_NAME)
+	install -p $(externals_src)/pdp/abstractions/*.pd $(objectsdir)/$(PDP_NAME)
+	install -d $(helpdir)/$(PDP_NAME)
+	install -p $(externals_src)/pdp/doc/objects/*.* $(helpdir)/$(PDP_NAME)
 	install -d $(manualsdir)/$(PDP_NAME)
 	install -p $(externals_src)/pdp/doc/reference.txt $(manualsdir)/$(PDP_NAME)
 	install -p $(externals_src)/pdp/doc/introduction/*.* \
@@ -313,6 +318,29 @@ pdp_install: pdp
 		$(examplesdir)/$(PDP_NAME)
 
 
+#------------------------------------------------------------------------------#
+# PIDIP
+PIDIP_NAME=pidip
+pidip:
+#	cd $(externals_src)/pidip && ./configure && $(MAKE)
+
+pidip_install: pidip
+	install -d $(objectsdir)/$(PIDIP_NAME)
+	$(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(PIDIP_NAME) \
+		--author "Yves Degoyon" \
+		--description "PiDiP is Definitely in Pieces"
+	-install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir)/$(PIDIP_NAME)
+	install -d $(helpdir)/$(PIDIP_NAME)
+	install -p $(externals_src)/pidip/doc/*.pd $(helpdir)/$(PIDIP_NAME)
+	install -d $(examplesdir)/$(PIDIP_NAME)
+	install -p $(externals_src)/pidip/patches/*.* $(examplesdir)/$(PIDIP_NAME)
+	install -d $(examplesdir)/$(PIDIP_NAME)/images
+	install -p $(externals_src)/pidip/patches/images/*.* \
+		$(examplesdir)/$(PIDIP_NAME)/images
+	install -d $(examplesdir)/$(PIDIP_NAME)/morphology
+	install -p $(externals_src)/pidip/patches/morphology/*.* \
+		$(examplesdir)/$(PIDIP_NAME)/morphology
+
 
 #------------------------------------------------------------------------------#
 # PMPD
@@ -323,8 +351,7 @@ pmpd:
 pmpd_install: pmpd
 #	install -d $(objectsdir)/$(PMPD_NAME)
 	install -d $(helpdir)/$(PMPD_NAME)
-	install -p $(externals_src)/pmpd/help/*.pd \
-		 $(helpdir)/$(PMPD_NAME)
+	install -p $(externals_src)/pmpd/help/*.pd $(helpdir)
 	install -d $(manualsdir)/$(PMPD_NAME)
 	install -d $(manualsdir)/$(PMPD_NAME)
 	install -p $(externals_src)/pmpd/doc/pmpd.pdf/pmpd.pdf \
@@ -360,6 +387,31 @@ toxy_install: toxy
 		$(examplesdir)/$(TOXY_NAME)
 
 
+#------------------------------------------------------------------------------#
+# UNAUTHORIZED
+UNAUTHORIZED_NAME=unauthorized
+# unauthorized is compiled straight into $(OUT_DIR)
+UNAUTHORIZED_OUT_DIR=$(objectsdir)/$(UNAUTHORIZED_NAME)
+unauthorized:
+
+
+unauthorized_install: unauthorized
+# this needs to go here since it produces errors
+	-cd $(externals_src)/unauthorized && $(MAKE) -k
+	install -d $(objectsdir)/$(UNAUTHORIZED_NAME)
+	install -p $(externals_src)/unauthorized/*/*.$(EXTENSION) \
+		$(objectsdir)/$(UNAUTHORIZED_NAME)
+	install -d $(helpdir)/$(UNAUTHORIZED_NAME)
+	install -p $(externals_src)/unauthorized/*/*.pd \
+		$(helpdir)/$(UNAUTHORIZED_NAME)
+	install -p $(externals_src)/unauthorized/*/*.txt \
+		$(helpdir)/$(UNAUTHORIZED_NAM)
+	install -p $(externals_src)/unauthorized/*/*.pls \
+		$(helpdir)/$(UNAUTHORIZED_NAME)
+	install -d $(helpdir)/$(UNAUTHORIZED_NAME)/blm
+	install -p $(externals_src)/unauthorized/blinkenlights/blm/*.* \
+		$(helpdir)/$(UNAUTHORIZED_NAME)/blm
+
 
 #------------------------------------------------------------------------------#
 # VBAP
@@ -390,11 +442,13 @@ zexy:
 zexy_install: zexy
 	install -d $(objectsdir)/$(ZEXY_NAME)
 #	install -p $(externals_src)/zexy/src/*.$(EXTENSION) $(objectsdir)/$(ZEXY_NAME)
-	install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | \
-		grep -v '-help.pd' | sed 's/\([&<>|~]\)/\\\1/g') \
+	install -p $(shell ls -1 $(externals_src)/zexy/abs/*.pd | grep -v '-help.pd' | sed 's|\(.*\)|"\1"|g') \
 		$(objectsdir)/$(ZEXY_NAME)
+#		grep -v '-help.pd' | sed 's/\([&<>|~]\)/\\\1/g') \
+
 	install -d $(helpdir)/$(ZEXY_NAME)
-	install -p $(externals_src)/zexy/abs/*-help.pd $(helpdir)/$(ZEXY_NAME)
+	install -p $(shell ls -1 $(externals_src)/zexy/abs/*-help.pd | sed 's|\(.*\)|"\1"|g') \
+		$(helpdir)/$(ZEXY_NAME)
 	install -p $(externals_src)/zexy/zexy.pd  $(helpdir)
 	install -p $(externals_src)/zexy/examples/*.* $(helpdir)/$(ZEXY_NAME)
 
@@ -431,15 +485,6 @@ unfiltered_install:
 	-cd $(externals_src)/OSCx && $(MAKE) CC=gcc
 	-install -p $(externals_src)/OSCx/src/*.$(EXTENSION) $(objectsdir)
 	install -p $(externals_src)/OSCx/doc/*.* $(helpdir)
-#----------------------------------------------------------------------------
-# unauthorized
-# these don't work on Windows yet
-	-cd $(externals_src)/unauthorized && $(MAKE) 
-	-install -p $(externals_src)/unauthorized/*/*.$(EXTENSION) $(objectsdir)
-	install -p $(externals_src)/unauthorized/*/*.pd $(helpdir)
-	install -p $(externals_src)/unauthorized/*/*.txt $(helpdir)
-	install -p $(externals_src)/unauthorized/*/*.pls $(helpdir)
-	cp -Rfp $(externals_src)/unauthorized/blinkenlights/blm  $(helpdir)
 
 
 #==============================================================================#
@@ -466,7 +511,7 @@ clean: install_clean
 	cd $(externals_src)/mixed/cyclone && make $(DEST_PATHS) clean
 	cd $(externals_src)/mixed/pddp && make $(DEST_PATHS) clean
 	cd $(externals_src)/mixed/toxy && make $(DEST_PATHS) clean
-	cd $(externals_src)/unauthorized && make $(DEST_PATHS) clean
+	cd $(externals_src)/unauthorized && make clean
 
 distclean: clean cruft_clean
 	rm $(externals_src)/OSCx Makefile
diff --git a/externals/build/TODO b/externals/build/TODO
index 7f6e5de6..ad5d4e12 100644
--- a/externals/build/TODO
+++ b/externals/build/TODO
@@ -6,7 +6,9 @@
   subdir.
 
 - get externals/build/src/prepend.c to compile in Pd mode, which means it will
-  have a right inlet when created without an argument
+  have a right inlet when created without an argument (because of cyclone's
+  buld system, its quite difficult to do.  I think it should just be removed
+  from default)
 
 - add in mtx_ objects with special characters using setup functions and
   filenames with 0x escapes (mtx_/ and mtx_./ for example).  Make sure to have
@@ -25,12 +27,6 @@
 		cxc/prepend
 		flext/prepend
 
-- move .libs files to externals/build/src from externals/build/PLATFORM.  The
-  platform-specific makefiles copy them before compiling.  If a
-  platform-specific .libs file is needed, create it in the
-  externals/build/PLATFORM directory.  The makefiles will use both:
-  `test -f $*.libs && cat $*.libs` `test -f ../src/$*.libs && cat ../src/$*.libs`
-
 - add these to the build system:
       PDContainer
       ann
diff --git a/externals/build/win/makefile b/externals/build/win/makefile
index 43ee83fb..137fb2cf 100644
--- a/externals/build/win/makefile
+++ b/externals/build/win/makefile
@@ -48,8 +48,8 @@ OPTIM_FLAGS = -O3 -march=i686 -mfpmath=sse -msse
 CFLAGS = -Wall -W -Wshadow -Wstrict-prototypes -Wno-unused -Wno-parentheses \
 	 -Wno-switch $(OPTIM_FLAGS)
 
-INCLUDE = -I. -I.. -I$(PD_PATH)/src -IC:/msys/1.0/local/include
-LDFLAGS = -shared -LC:/msys/1.0/local/lib -L$(PD_PATH)/bin -lpd
+INCLUDE = -I. -I.. -I$(PD_PATH)/src -IC:/msys/1.0/include
+LDFLAGS = -shared -LC:/msys/1.0/lib -L$(PD_PATH)/bin -lpd
 
 all: externals
 
@@ -65,7 +65,6 @@ externals: $(EXTERNALS:.c=.dll)
 		`test -f $*.libs && cat $*.libs` \
 		`test -f ../src/$*.libs && cat ../src/$*.libs` 
 	$(STRIP) "$*.dll"
-#	strip --strip-all "$*.dll"
 	rm "$*.o"
 
 clean:
diff --git a/externals/build/win/oggamp~.libs b/externals/build/win/oggamp~.libs
index f203f33f..726b7910 100644
--- a/externals/build/win/oggamp~.libs
+++ b/externals/build/win/oggamp~.libs
@@ -1 +1 @@
--logg -lvorbisenc -lvorbisfile -lvorbis -lpthreadGC2 -lwsock32
+-lwsock32 -lpthreadGC2
diff --git a/externals/build/win/oggcast~.libs b/externals/build/win/oggcast~.libs
index 8801af95..726b7910 100644
--- a/externals/build/win/oggcast~.libs
+++ b/externals/build/win/oggcast~.libs
@@ -1 +1 @@
--logg -lvorbis -lvorbisenc -lvorbisfile -lwsock32 -lpthreadGC2
+-lwsock32 -lpthreadGC2
diff --git a/externals/build/win/oggread~.libs b/externals/build/win/oggread~.libs
deleted file mode 100644
index 28114c53..00000000
--- a/externals/build/win/oggread~.libs
+++ /dev/null
@@ -1 +0,0 @@
--logg -lvorbis -lvorbisenc -lvorbisfile
diff --git a/externals/build/win/oggwrite~.libs b/externals/build/win/oggwrite~.libs
deleted file mode 100644
index 28114c53..00000000
--- a/externals/build/win/oggwrite~.libs
+++ /dev/null
@@ -1 +0,0 @@
--logg -lvorbis -lvorbisenc -lvorbisfile
diff --git a/packages/Makefile b/packages/Makefile
index 5fa194ad..e98d3814 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -170,8 +170,8 @@ pd:
 	echo "DEST_PATHS $(DEST_PATHS)"
 	echo "PD_DEST_PATHS $(PD_DEST_PATHS)"
 	echo "PD_EXTRA_FLAGS $(PD_EXTRA_FLAGS)"
-	cd $(pd_src)/src/ && $(PD_AUTOCONF)
-	cd $(pd_src)/src && ./configure $(PD_CONFIGURE_FLAGS) && \
+	-cd $(pd_src)/src/ && $(PD_AUTOCONF)
+	-cd $(pd_src)/src && ./configure $(PD_CONFIGURE_FLAGS) && \
 		make $(PD_DEST_PATHS) $(PD_EXTRA_FLAGS)
 
 
@@ -181,11 +181,15 @@ pd:
 #
 #==============================================================================#
 
+# this is used for installing into a pre-build Pd binary
+extended_install: abstractions_install doc_install externals_install \
+flext_install gem_install readme_install welcome_install license_install \
+noncvs_install
+
+
 #------------------------------------------------------------------------------
 # install
-install: license_install readme_install welcome_install gem_install
-install: pd_install abstractions_install doc_install externals_install
-install: noncvs_install
+install: pd_install extended_install
 	@echo "Complete install succeeded!"
 
 #------------------------------------------------------------------------------
@@ -208,21 +212,144 @@ externals_install:
 #------------------------------------------------------------------------------
 # flext_install
 flext_install:
+# FLEXT
+# temp hack -HCS
+#	test -f $(externals_src)/grill/flext/buildsys/mac/pd/config-gcc.def || \
+#		cp $(externals_src)/grill/flext/buildsys/mac/pd/config-gcc.def \
+#			$(externals_src)/grill/flext/buildsys/config-mac-pd-gcc.txt
+# end temp hack
+# tigital 8/30/2005 added
+#	cd $(externals_src)/grill/flext && \
+#		( \
+#        test -f buildsys/config-mac-pd-gcc.txt || \
+#          ( \
+#            cp buildsys/mac/pd/config-gcc.def buildsys/config-mac-pd-gcc.txt && \
+#            echo Copied template sys config file \
+          ) \
+      ) && \
+		( \
+			cat buildsys/config-mac-pd-gcc.txt | \
+				sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" > buildsys/config-mac-pd-gcc.txt \
+		) && \
+		( \
+			cat package.txt | sed "s/^PRECOMPILE=.*/PRECOMPILE=/" > package.txt \
+		) && \
+		( \
+			cat buildsys/mac/pd/gnumake-gcc-ext.inc | \
+				sed "s/^LDFLAG\S +=.*/LDFLAG\S += -bundle -bundle_loader ..\/..\/..\/pd\/bin\/pd/" > buildsys/mac/pd/gnumake-gcc-ext.inc \
+		) && \
+			( \
+			cat buildsys/mac/pd/gnumake-gcc-flext.inc | \
+				sed "s/^LDFLAG\S +=.*/LDFLAG\S += -dynamiclib -undefined dynamic_lookup /" > buildsys/mac/pd/gnumake-gcc-flext.inc \
+		) && \
+		( \
+			test -f config.txt || \
+			( \
+				cp -f build/config-mac.def config.txt && \
+				echo Copied template flext config file \
+			) \
+		) && \
+#		MACOSX_DEPLOYMENT_TARGET=10.3 bash build.sh pd gcc build-release-shared FLEXTLIB=@executable_path/../extra FLEXTINC=../flext/source FLEXTSYS=$(objectsdir)
+#	ln -sf $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.dylib
+#	install -p $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(objectsdir)
+#	ln -sf libflext-pd.$(FLEXT_VERSION).dylib $(objectsdir)/libflext-pd.dylib
+	install -d $(manualsdir)/flext
+	cp -rp $(externals_src)/grill/flext/tutorial $(manualsdir)/flext
+	install -p $(externals_src)/grill/flext/gpl.txt  \
+		$(externals_src)/grill/flext/readme.txt   \
+		$(externals_src)/grill/flext/license.txt  \
+		$(manualsdir)/flext
+# FLEXTERNALS
+#########
+# dyn~
+	-cd $(externals_src)/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared FLEXTLIB=../flext/pd-darwin/release-shared FLEXTINC=../flext/source FLEXTSYS=$(objectsdir)
+	-install -p $(externals_src)/grill/dynext/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir)
+	install -p $(externals_src)/grill/dynext/pd/*.pd $(helpdir)
+	install -d $(manualsdir)/dynext
+	install -p $(externals_src)/grill/dynext/gpl.txt  \
+		$(externals_src)/grill/dynext/readme.txt   \
+		$(externals_src)/grill/dynext/license.txt  \
+		$(manualsdir)/dynext
+#########
+# pool
+	-cd $(externals_src)/grill/pool && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source
+	-install -p $(externals_src)/grill/pool/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir)
+	install -p $(externals_src)/grill/pool/pool-help.pd $(helpdir)
+	install -d $(manualsdir)/pool
+	install -p $(externals_src)/grill/pool/gpl.txt \
+		$(externals_src)/grill/pool/readme.txt   \
+		$(externals_src)/grill/pool/license.txt \
+		$(manualsdir)/pool
+#########
+# py/pyext
+#	cd $(externals_src)/grill/py && \
+#		( \
+#			cp -f build/config-mac.def config.txt \
+#		) && \
+#		bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source
+#	install -p $(externals_src)/grill/py/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir)
+# this wasn't building for me -HCS 2005-06-09
+	install -d $(examplesdir)/py/examples
+	install -d $(examplesdir)/py/scripts
+	install -p $(externals_src)/grill/py/pd/*.pd $(examplesdir)/py/examples
+	install -p $(externals_src)/grill/py/scripts/*.py $(examplesdir)/py/scripts
+	install -d $(manualsdir)/py/scripts
+	install -p $(externals_src)/grill/py/gpl.txt  \
+		$(externals_src)/grill/py/readme.txt $(externals_src)/grill/py/license.txt \
+		$(manualsdir)/py
+#	install -d $(prefix)/Library/Frameworks
+#	cp -R /Library/Frameworks/Python.framework $(prefix)/Library/Frameworks
+#########
+# vasp
+#  fails without the dir
+#	test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin 
+#	cd $(externals_src)/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source
+#	install -p $(externals_src)/grill/vasp/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir)
+# this wasn't building for me -HCS 2005-06-09
+	install -d $(helpdir)/vasp
+	install -p $(externals_src)/grill/vasp/pd-help/*.pd $(helpdir)/vasp
+	install -d $(manualsdir)/vasp
+	install -p $(externals_src)/grill/vasp/gpl.txt  \
+		$(externals_src)/grill/vasp/readme.txt   \
+		$(externals_src)/grill/vasp/license.txt  \
+		$(externals_src)/grill/vasp/changes.txt  \
+		$(externals_src)/grill/vasp/todo.txt     \
+		$(manualsdir)/vasp
+	install -d $(examplesdir)/vasp
+	cp -rp $(externals_src)/grill/vasp/pd-ex $(examplesdir)/vasp
+#########
+# xsample
+#	cd $(externals_src)/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source
+#	install -p $(externals_src)/grill/xsample/pd-darwin/release-shared/*.$(EXTENSION) $(objectsdir)
+	install -p $(externals_src)/grill/xsample/pd/*.pd $(helpdir)
+	install -d $(manualsdir)/xsample
+	install -p $(externals_src)/grill/xsample/gpl.txt \
+		$(externals_src)/grill/xsample/readme.txt \
+		$(externals_src)/grill/xsample/license.txt \
+		$(manualsdir)/xsample
+########## FOOTILS #########
+# syncgrain
+#	cd $(externals_src)/footils/syncgrain/ && $(MAKE) -f makefile.pd-darwin
+#	install -p $(externals_src)/footils/syncgrain/pd-darwin/*.$(EXTENSION) \
+#		$(objectsdir)
+	install -p $(externals_src)/footils/syncgrain/pd/*.* $(helpdir)
+########## NUSMUK ##########
 # nusmuk
-	cd $(externals_src)/nusmuk/msd && $(externals_src)/grill/flext/build.sh \
-		pd gcc install
-	cd $(externals_src)/nusmuk/msd2D && $(externals_src)/grill/flext/build.sh \
-		pd gcc install
-	cd $(externals_src)/nusmuk/msd3D && $(externals_src)/grill/flext/build.sh \
-		pd gcc install
+#	cd $(externals_src)/nusmuk/msd && $(externals_src)/grill/flext/build.sh \
+#		pd gcc install
+#	cd $(externals_src)/nusmuk/msd2D && $(externals_src)/grill/flext/build.sh \
+#		pd gcc install
+#	cd $(externals_src)/nusmuk/msd3D && $(externals_src)/grill/flext/build.sh \
+#		pd gcc install
 #TODO: need to add nusmuk/editor
 
 
 #------------------------------------------------------------------------------
 # gem_install
-GEM_NAME = gem
+GEM_NAME = Gem
 gem_install: gem $(helpdir)
-	install -p $(gem_src)/help/*.* $(helpdir)
+	install -d $(helpdir)/$(GEM_NAME)
+	install -p $(gem_src)/help/*.* $(helpdir)/$(GEM_NAME)
 	install -p $(gem_src)/abstractions/*-help.pd $(helpdir)
 	install -d $(objectsdir)/$(GEM_NAME)
 	install -p $(shell ls -1 $(gem_src)/abstractions/*.* | \
@@ -368,10 +495,11 @@ doc_format:
 	-find $(prefix) -name .DS_Store -delete
 	-find $(prefix) -name '*.*.bak' -delete
 # run script to move help-*.pd files to *-help.pd according to the standard
-	cd $(pddocdir) && \
+	cd $(helpdir) && \
+		$(scripts_src)/convert-help-to-standard.sh
+	cd $(helpdir)/iemabs && \
 		$(scripts_src)/convert-help-to-standard.sh
 # remove write perms to prevent people form editing the helpfiles by mistake
-	cd $(pddocdir) && chmod a-wx */*.pd */*/*.pd
 	find $(pddocdir) -name '*.pd' -print0 | xargs -0 chmod a-wx
 	find $(pddocdir) -name '*.txt' -print0 | xargs -0 chmod a-wx
 
diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index 4e386afc..10281088 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -120,11 +120,11 @@ $(objectsdir): $(prefix)
 
 
 PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
-	sed 's/char pd_version\[\] = "Pd version \([0-9]\)\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\\n";/\1/')
+	sed 's/char pd_version\[\] = "Pd version \([0-9]\)\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*.n";/\1/')
 PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
-	sed 's/char pd_version\[\] = "Pd version [0-9]\.\([0-9]*\)[. TES-]*\([0-9]*\)[0-9extndRC.-]*\\n";/\1/')
+	sed 's/char pd_version\[\] = "Pd version [0-9]\.\([0-9]*\)[. TES-]*\([0-9]*\)[0-9extndRC.-]*.n";/\1/')
 PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \
-	sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*\([0-9]*\)[0-9extndRC.-]*\\n";/\1/')
+	sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*\([0-9]*\)[0-9extndRC.-]*.n";/\1/')
 # the separators [.-] need to be the same as in s_main.c or the regexps break
 PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)
 
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 8380f634..607552c6 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -124,130 +124,6 @@ darwin_app_externals: darwin_app_externals_standard darwin_app_externals_c++ dar
 #darwin_app_externals: darwin_app_externals_standard darwin_app_externals_c++
 
 
-#------------------------------------------------------------------------------#
-darwin_app_externals_flext:
-#----------------------------------------------------------------------------
-# FLEXT
-# temp hack -HCS
-	test -f $(externals_src)/grill/flext/buildsys/mac/pd/config-gcc.def || \
-		cp $(externals_src)/grill/flext/buildsys/mac/pd/config-gcc.def \
-			$(externals_src)/grill/flext/buildsys/config-mac-pd-gcc.txt
-# end temp hack
-# tigital 8/30/2005 added
-	cd $(externals_src)/grill/flext && \
-		( \
-        test -f buildsys/config-mac-pd-gcc.txt || \
-          ( \
-            cp buildsys/mac/pd/config-gcc.def buildsys/config-mac-pd-gcc.txt && \
-            echo Copied template sys config file \
-          ) \
-      ) && \
-		( \
-			cat buildsys/config-mac-pd-gcc.txt | \
-				sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" > buildsys/config-mac-pd-gcc.txt \
-		) && \
-		( \
-			cat package.txt | sed "s/^PRECOMPILE=.*/PRECOMPILE=/" > package.txt \
-		) && \
-		( \
-			cat buildsys/mac/pd/gnumake-gcc-ext.inc | \
-				sed "s/^LDFLAG\S +=.*/LDFLAG\S += -bundle -bundle_loader ..\/..\/..\/pd\/bin\/pd/" > buildsys/mac/pd/gnumake-gcc-ext.inc \
-		) && \
-			( \
-			cat buildsys/mac/pd/gnumake-gcc-flext.inc | \
-				sed "s/^LDFLAG\S +=.*/LDFLAG\S += -dynamiclib -undefined dynamic_lookup /" > buildsys/mac/pd/gnumake-gcc-flext.inc \
-		) && \
-		( \
-			test -f config.txt || \
-			( \
-				cp -f build/config-mac.def config.txt && \
-				echo Copied template flext config file \
-			) \
-		) && \
-		MACOSX_DEPLOYMENT_TARGET=10.3 bash build.sh pd gcc build-release-shared FLEXTLIB=@executable_path/../extra FLEXTINC=../flext/source FLEXTSYS=$(objectsdir)
-	ln -sf $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.dylib
-	install -p -m0444 $(externals_src)/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(objectsdir)
-	ln -sf libflext-pd.$(FLEXT_VERSION).dylib $(objectsdir)/libflext-pd.dylib
-	install -d $(pddocdir)/tutorials
-	cp -rp $(externals_src)/grill/flext/tutorial $(pddocdir)/tutorials/flext
-	install -d $(pddocdir)/flext
-	install -p -m0644 $(externals_src)/grill/flext/gpl.txt  \
-		$(externals_src)/grill/flext/readme.txt   \
-		$(externals_src)/grill/flext/license.txt  \
-		$(pddocdir)/flext
-# FLEXTERNALS
-#########
-# dyn~
-	cd $(externals_src)/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared FLEXTLIB=../flext/pd-darwin/release-shared FLEXTINC=../flext/source FLEXTSYS=$(objectsdir)
-	install -p $(externals_src)/grill/dynext/pd-darwin/release-shared/*.pd_darwin $(objectsdir)
-	install -p $(externals_src)/grill/dynext/pd/*.pd $(pddocdir)
-	install -d $(pddocdir)/dynext
-	install -p $(externals_src)/grill/dynext/gpl.txt  \
-		$(externals_src)/grill/dynext/readme.txt   \
-		$(externals_src)/grill/dynext/license.txt  \
-		$(pddocdir)/dynext
-#########
-# pool
-	cd $(externals_src)/grill/pool && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source
-	install -p $(externals_src)/grill/pool/pd-darwin/release-shared/*.pd_darwin $(objectsdir)
-	install -p $(externals_src)/grill/pool/help-pool.pd $(pddocdir)
-	install -d $(pddocdir)/pool
-	install -p $(externals_src)/grill/pool/gpl.txt \
-		$(externals_src)/grill/pool/readme.txt   \
-		$(externals_src)/grill/pool/license.txt \
-		$(pddocdir)/pool
-#########
-# py/pyext
-#	cd $(externals_src)/grill/py && \
-#		( \
-#			cp -f build/config-mac.def config.txt \
-#		) && \
-#		bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source
-#	install -p -m0444 $(externals_src)/grill/py/pd-darwin/release-shared/*.pd_darwin $(objectsdir)
-# this wasn't building for me -HCS 2005-06-09
-	install -d $(pddocdir)/py/examples
-	install -d $(pddocdir)/py/scripts
-	install -p $(externals_src)/grill/py/pd/*.pd $(pddocdir)/py/examples
-	install -p $(externals_src)/grill/py/scripts/*.py $(pddocdir)/py/scripts
-	install -p $(externals_src)/grill/py/gpl.txt  \
-		$(externals_src)/grill/py/readme.txt $(externals_src)/grill/py/license.txt \
-		$(pddocdir)/py
-#	install -d $(prefix)/Library/Frameworks
-#	cp -R /Library/Frameworks/Python.framework $(prefix)/Library/Frameworks
-#########
-# vasp
-#  fails without the dir
-#	test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin 
-#	cd $(externals_src)/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source
-#	install -p -m0444 $(externals_src)/grill/vasp/pd-darwin/release-shared/*.pd_darwin $(objectsdir)
-# this wasn't building for me -HCS 2005-06-09
-	install -p -m0644 $(externals_src)/grill/vasp/pd-help/*.pd $(pddocdir)
-	install -d $(pddocdir)/vasp
-	install -p -m0644 $(externals_src)/grill/vasp/gpl.txt  \
-		$(externals_src)/grill/vasp/readme.txt   \
-		$(externals_src)/grill/vasp/license.txt  \
-		$(externals_src)/grill/vasp/changes.txt  \
-		$(externals_src)/grill/vasp/todo.txt     \
-		$(pddocdir)/vasp
-	cp -rp $(externals_src)/grill/vasp/pd-ex $(pddocdir)/vasp
-#########
-# xsample
-	cd $(externals_src)/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(objectsdir) FLEXTINC=../flext/source
-	install -p -m0444 $(externals_src)/grill/xsample/pd-darwin/release-shared/*.pd_darwin $(objectsdir)
-	install -p -m0644 $(externals_src)/grill/xsample/pd/*.pd $(pddocdir)
-	install -d $(pddocdir)/xsample
-	install -p -m0644 $(externals_src)/grill/xsample/gpl.txt \
-		$(externals_src)/grill/xsample/readme.txt \
-		$(externals_src)/grill/xsample/license.txt \
-		$(pddocdir)/xsample
-########## FOOTILS #########
-# syncgrain
-#	cd $(externals_src)/footils/syncgrain/ && $(MAKE) -f makefile.pd-darwin
-#	install -p -m0444 $(externals_src)/footils/syncgrain/pd-darwin/*.pd_darwin \
-#		$(objectsdir)
-	install -p -m0644 $(externals_src)/footils/syncgrain/pd/*.* $(pddocdir)
-
-
 
 
 darwin_app_externals_c++:
@@ -305,6 +181,14 @@ darwin_app_externals_flext_clean:
 #
 #==============================================================================#
 
+
+darwin_app_externals_flext:
+	@echo " "
+	@echo "Deprecated!!" 
+	@echo "cd $(packages_src) && make flext_install"
+	cd $(packages_src) && make $(DEST_PATHS) flext_install
+
+
 darwin_app_noncvs:
 	@echo " "
 	@echo "Deprecated!!" 
diff --git a/packages/patches/win/win_font_tweaks.patch b/packages/patches/win/win_font_tweaks.patch
new file mode 100644
index 00000000..a7c9cd82
--- /dev/null
+++ b/packages/patches/win/win_font_tweaks.patch
@@ -0,0 +1,25 @@
+Index: u_main.tk
+===================================================================
+RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
+retrieving revision 1.7.2.4
+diff -u -w -r1.7.2.4 u_main.tk
+--- u_main.tk	21 Feb 2005 04:20:20 -0000	1.7.2.4
++++ u_main.tk	27 Nov 2005 04:08:45 -0000
+@@ -158,7 +158,7 @@
+ 
+ 
+ frame .printout
+-text .printout.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \
++text .printout.text -relief raised -bd 2 -font { courier 9 } \
+     -yscrollcommand ".printout.scroll set" -width 80
+ # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n"
+ scrollbar .printout.scroll -command ".printout.text yview"
+@@ -337,7 +337,7 @@
+     global pd_myversion
+     set name [format ".help%d" $doc_number]
+     toplevel $name
+-    text $name.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \
++    text $name.text -relief raised -bd 2 -font { helvetica 10 } \
+     	-yscrollcommand "$name.scroll set" -background white
+     scrollbar $name.scroll -command "$name.text yview"
+     pack $name.scroll -side right -fill y
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index 0bd7b558..192aa52d 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -20,9 +20,15 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \
 				prefix=$(prefix) \
 				UNAME=$(UNAME)
 
+PD_INNO_SETUP = pd-inno.iss
 
-install: extended_install
 
+install: $(PD_INNO_SETUP)
+	cd $(packages_src) && make $(DEST_PATHS) extended_install
+	cd .. && make $(DEST_PATHS) doc_format
+	install -p pd-settings.reg $(prefix)
+	@echo " "
+	@echo "win32_inno install succeeded!"
 
 #==============================================================================#
 #
@@ -30,15 +36,19 @@ install: extended_install
 #
 #==============================================================================#
 
-PD_ISS_NAME = pd-inno.iss
-$(PD_ISS_NAME): $(PD_ISS_NAME).in
-	@echo "Making Inno Setup file: $(PD_ISS_NAME)"
-	cat "$(PD_ISS_NAME).in" | \
+# since I can't get Pd to compile, here are some hacks to assemble a package
+# from binaries
+no_compile_hacks:
+	cp -a /c/Program\ Files/pd-0.38-4 $(prefix)/
+
+$(PD_INNO_SETUP): $(PD_INNO_SETUP).in
+	@echo "Making Inno Setup file: $(PD_INNO_SETUP)"
+	cat "$(PD_INNO_SETUP).in" | \
 		sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/g' | \
-		sed 's/PD_VERSION/$(PD_VERSION)-$(PACKAGE_VERSION)/g' > \
-		$(PD_ISS_NAME)
-	-./generate_inno_files.sh >> $(PD_ISS_NAME)
-#	start $(PD_ISS_NAME)
+		sed 's/PD_VERSION/$(PD_VERSION)/g' | \
+		sed 's/PACKAGE_VERSION/$(PACKAGE_VERSION)/g' > \
+		$(PD_INNO_SETUP)
+#	start $(PD_INNO_SETUP)
 
 #==============================================================================#
 #
@@ -46,6 +56,8 @@ $(PD_ISS_NAME): $(PD_ISS_NAME).in
 #
 #==============================================================================#
 
-extended_install:
-	cd $(packages_src) && make $(DEST_PATHS) install
+clean: 	
+	rm $(PD_INNO_SETUP)
+	cd $(packages_src) && make $(DEST_PATHS) clean
+
 
diff --git a/packages/win32_inno/generate_inno_files.sh b/packages/win32_inno/generate_inno_files.sh
deleted file mode 100755
index 22bd3e91..00000000
--- a/packages/win32_inno/generate_inno_files.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-ROOT_DIR=build
-#ROOT_DIR="$INSTALL_PREFIX"
-
-function print_dir()
-{
-	 SED=`echo "sed 's|${ROOT_DIR}/||'"`
-	 source=$1
-	 dest=`echo $source | eval $SED `
-	 echo "Source: ${source}/*.*; DestDir: {app}/$dest; Flags: ignoreversion" | \
-		  sed 's|/|\\|g'
-}
-
-function traverse_tree() 
-{
-	 my_dir_root="$1"
-#	 echo "ROOT: $my_dir_root"
-	 FILES=`ls -1d ${my_dir_root}/* | grep -v CVS`
-	 if [ "x$FILES" != "x" ]; then
-		  print_dir "$dir"
-		  for dir in $FILES; do
-				test -d "$dir" && traverse_tree "$dir"
-		  done
-	 fi
-}
-
-
-traverse_tree "${ROOT_DIR}"
-
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 3e0afcf7..dc956c23 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -7,7 +7,7 @@
 

 [Setup]

 AppName=pd

-AppVerName=PACKAGE_NAME

+AppVerName=Pd-PD_VERSION-PACKAGE_VERSION

 AppPublisher=pure-data.org

 AppPublisherURL=http://puredata.org

 AppSupportURL=http://puredata.org/community/lists/

@@ -34,12 +34,15 @@ Name: {group}\puredata.org; Filename: {app}\pd.url
 Name: {group}\Uninstall Pure Data; Filename: {uninstallexe}

 Name: {userdesktop}\Pure Data; Filename: {app}\bin\pd.exe; Tasks: desktopicon; IconFilename: {app}\lib\pd.ico; IconIndex: 0; WorkingDir: {app}

 Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Pure Data; Filename: {app}\bin\pd.exe; Tasks: quicklaunchicon; WorkingDir: {app}; IconFilename: {app}\lib\pd.ico; IconIndex: 0

-

-;Name: {group}\Pure Data (no video); Filename: {app}\pd-novideo.bat; IconFilename: {app}\lib\pd.ico; IconIndex: 0; Tasks: quicklaunchicon desktopicon; WorkingDir: {app}

 Name: {group}\Documentation\Pd Manual; Filename: {app}\doc\1.manual\index.htm

 Name: {group}\Documentation\Pd Drums Tutorial; Filename: {app}\doc\tutorials\footils\pddrums\pddrums.html

 Name: {group}\Documentation\Gem Manual; Filename: {app}\doc\gem\00.manual\index.html

 Name: {group}\Documentation\Gem Primer; Filename: {app}\doc\gem\GemPrimer.pdf

+;-----------------------------------------------------------------------------

+; GRIPD

+#ifexist "build\bin\gripd.exe"

+Name: {group}\GrIPD; Filename: {app}\bin\gripd.exe

+#endif

 

 

 [Run]

@@ -72,25 +75,16 @@ OutputExeFilename=Output\PACKAGE_NAME.exe
 ; packages\win32_inno

 Source: pdpatch.ico; DestDir: {app}\lib

 Source: pd.ico; DestDir: {app}\lib

-#ifexist "pd-nolibs.bat"

-  Source: pd-nolibs.bat; DestDir: {app}

-#endif

-#ifexist "pd.bat"

-  Source: pd.bat; DestDir: {app}

-#endif

-#ifexist "pd-novideo.bat"

-  Source: pd-novideo.bat; DestDir: {app}

-#endif

 ;

 ;

 ;-----------------------------------------------------------------------------

 ; put pdsend and pdreceive in the System dir so that they are in the path

 ;

-Source: build\bin\pdsend.exe; DestDir: {sys}; Flags: confirmoverwrite

-Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite

+Source: build\bin\pdsend.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder

+Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder

 ; add Cyclone's cyclist.exe if it is present

 #ifexist "build\bin\cyclist.exe"

-  Source: build\bin\cyclist.exe; DestDir: {sys}; Flags: confirmoverwrite

+Source: build\bin\cyclist.exe; DestDir: {sys}; Flags: confirmoverwrite promptifolder

 #endif

 ;

 ;

@@ -104,19 +98,17 @@ Source: build\bin\pdreceive.exe; DestDir: {sys}; Flags: confirmoverwrite
 ;

 ;

 ;-----------------------------------------------------------------------------

-; non CVS files

-;

-#ifexist "noncvs\extra"

-Source: noncvs\extra\*.dll; DestDir: {app}\extra

-#endif

-#ifexist "noncvs\doc\5.reference"

-Source: noncvs\doc\5.reference\*.*; DestDir: {app}\doc\5.reference; Flags:

-ignoreversion

-#endif

-;

-;

-;-----------------------------------------------------------------------------

-; AUTO-GENERATED

-; below this line should be blank since the rest of this file is generated

-; by the packages/win32_inno/Makefile.  <hans@at.or.at>

-;

+; build system files

+;

+Source: build\doc\manuals\Pd\Welcome.html; DestDir: {app}; Flags: isreadme; Tasks: 

+Source: build\doc\manuals\Pd\ReadMe.html; DestDir: {app}; Flags: isreadme

+Source: build\doc\manuals\Pd\License.html; DestDir: {app}; Flags: isreadme

+Source: build\doc\manuals\Pd\PD LICENSE.txt; DestDir: {app}; Flags: isreadme

+Source: build\pd-settings.reg; DestDir: {app}; Flags: ignoreversion

+Source: build\bin\*.*; DestDir: {app}\bin; Flags: ignoreversion confirmoverwrite recursesubdirs uninsremovereadonly

+Source: build\doc\*.*; DestDir: {app}\doc; Flags: ignoreversion confirmoverwrite recursesubdirs uninsremovereadonly; Attribs: readonly

+Source: build\extra\*.*; DestDir: {app}\extra; Flags: ignoreversion recursesubdirs uninsremovereadonly promptifolder; Attribs: readonly

+Source: build\lib\*.*; DestDir: {app}\lib; Flags: ignoreversion recursesubdirs

+Source: build\portaudio\*.*; DestDir: {app}\portaudio; Flags: ignoreversion recursesubdirs

+Source: build\src\*.*; DestDir: {app}\src; Flags: ignoreversion recursesubdirs

+Source: build\tcl\*.*; DestDir: {app}\tcl; Flags: ignoreversion recursesubdirs

diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
new file mode 100755
index 00000000..2fddf6ba
--- /dev/null
+++ b/packages/win32_inno/pd-settings.reg
@@ -0,0 +1,11 @@
+Windows Registry Editor Version 5.00

+

+[HKEY_LOCAL_MACHINE\SOFTWARE\Pd]

+"path1"="c:/progra~1/pd/extra/cyclone"

+"path2"="c:/progra~1/pd/extra/iemabs"

+"path2"="c:/progra~1/pd/extra/unauthorized"

+"loadlib1"="gem"

+"loadlib2"="pmpd"

+"loadlib3"="vasp"

+"loadlib4"="xsample"

+

diff --git a/scripts/convert-help-to-standard.sh b/scripts/convert-help-to-standard.sh
index 54ee131a..56175fd1 100755
--- a/scripts/convert-help-to-standard.sh
+++ b/scripts/convert-help-to-standard.sh
@@ -11,8 +11,13 @@
 
 for helpfile in help-*.pd ; do
 	 if [ -e $helpfile ]; then
-		  mv "$helpfile" "`echo $helpfile | sed 's/^help\-\(.*\)\.pd$/\1-help.pd/'`"
-		  echo "SWAP $helpfile FOR `echo $helpfile | sed 's/^help\-\(.*\)\.pd$/\1-help.pd/'`"
+		  newhelpfile=`echo $helpfile | sed 's/^help\-\(.*\)\.pd$/\1-help.pd/'`
+		  if [ "$helpfile" != "$newhelpfile" ]; then
+				echo "  swap $helpfile" "$newhelpfile"
+				mv "$helpfile" "$newhelpfile"
+		  else
+				echo "SAMEFILE $helpfile"
+		  fi
 	 fi
 done