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

8 files changed, 236 insertions, 214 deletions

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"

+