fix installation of objects with a $ in the name and ease building of GNU/Linux distro tarball

svn path=/trunk/; revision=14632

3 files changed, 10 insertions, 13 deletions

diff --git a/packages/Makefile.buildlayout b/packages/Makefile.buildlayout
index a010e4e4..b6c6bc65 100644
--- a/packages/Makefile.buildlayout
+++ b/packages/Makefile.buildlayout
@@ -68,12 +68,6 @@ endif
 ifeq ($(UNAME_MACHINE),ppc)
   ARCH = powerpc
 endif
-# if machine has dpkg-deb, build a Debian package
-ifeq ($(shell test -x /usr/bin/dpkg-deb && echo YES),YES)
-  PACKAGE_TYPE = deb
-else
-  PACKAGE_TYPE = tarbz2
-endif
 
 #==============================================================================#
 #
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index 5d5e52b6..1086039d 100755
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -11,6 +11,13 @@ BUILDLAYOUT_DIR = $(cvs_root_dir)/packages
 
 include $(BUILDLAYOUT_DIR)/Makefile.buildlayout
 
+# if machine has dpkg-deb, build a Debian package
+ifeq ($(shell test -x /usr/bin/dpkg-shlibdeps && echo YES),YES)
+  PACKAGE_TYPE = deb
+else
+  PACKAGE_TYPE = tarbz2
+endif
+
 # for command-line UNIX versions, you need to install Pd into the same
 # directory as $(prefix) otherwise Pd won't be able to find extra, doc, etc.
 ifeq ($(PACKAGE_TYPE),deb)
@@ -156,8 +163,6 @@ installer_readme:
 
 
 installer_makefile:
-# it is very hard to escape the $ in shell scripts so delete files
-	-rm -f -- $(helpdir)/iem*/*\$$*.pd $(objectsdir)/iem*/*\$$*.pd
 # don't put the Makefile into the package yet, otherwise it'll get installed
 	./generate_install_makefile.bash  $(DESTDIR)$(prefix) > tarbz2Makefile
 	mv -i tarbz2Makefile $(DESTDIR)$(prefix)/Makefile
diff --git a/packages/linux_make/generate_install_makefile.bash b/packages/linux_make/generate_install_makefile.bash
index 3ef8a519..57e17648 100755
--- a/packages/linux_make/generate_install_makefile.bash
+++ b/packages/linux_make/generate_install_makefile.bash
@@ -12,8 +12,8 @@ SED=`echo sed "s|${ROOT_DIR}/||"`
 
 function print_file ()
 {
-	 local my_file=$1
-	 echo -e "\tinstall -p '$my_file' '\$(prefix)/$my_file'"
+     local my_file=`echo $1 | sed 's/\\\$/\$\$/g'`
+     echo -e "\tinstall -p '$my_file' '\$(prefix)/$my_file'"
 }
 
 function print_dir ()
@@ -38,9 +38,7 @@ function traverse_install_tree ()
 
 function remove_file () 
 {
-# arg, $n-help.pd causes lots of problems
-#	 local my_file=`echo $1 | sed 's|$|\\$|g'`
-	 local my_file=$1
+     local my_file=`echo $1 | sed 's/\\\$/\$\$/g'`
 	 echo -e "\trm -f -- '\$(prefix)/$my_file'"
 }