Partially fix "make framework-pkg"

[ghc-hetmet.git] / distrib / MacOS / installer-scripts / Uninstaller

diff --git a/distrib/MacOS/installer-scripts/Uninstaller b/distrib/MacOS/installer-scripts/Uninstaller
index 0b79258..696d571 100644 (file)
--- a/distrib/MacOS/installer-scripts/Uninstaller
+++ b/distrib/MacOS/installer-scripts/Uninstaller
@@ -48,19 +48,19 @@ if [ ${NO_VERSIONS} -ne 2 ]; then
 fi
 
 echo "Removing symbolic links into GHC.framework"
-for thisfile in `ls ${INSTALL_BIN}`; do
-  if ls -l ${INSTALL_BIN}/${thisfile} | grep -q GHC.framework/Versions; then
-    rm -f ${INSTALL_BIN}/${thisfile}
+for thisfile in ${INSTALL_BIN}/*; do
+  if ls -l "${thisfile}" | grep -q GHC.framework/Versions; then
+    rm -f "${thisfile}"
   fi
 done
-for thisfile in `ls ${INSTALL_MAN1}`; do
-  if ls -l ${INSTALL_MAN1}/${thisfile} | grep -q GHC.framework/Versions; then
-    rm -f ${INSTALL_MAN1}/${thisfile}
+for thisfile in ${INSTALL_MAN1}/*; do
+  if ls -l "${thisfile}" | grep -q GHC.framework/Versions; then
+    rm -f "${thisfile}"
   fi
 done
-for thisfile in `ls ${INSTALL_HTML}`; do
-  if ls -l ${INSTALL_HTML}/${thisfile} | grep -q GHC.framework/Versions; then
-    rm -f ${INSTALL_HTML}/${thisfile}
+for thisfile in ${INSTALL_HTML}/*; do
+  if ls -l "${thisfile}" | grep -q GHC.framework/Versions; then
+    rm -f "${thisfile}"
   fi
 done
 
@@ -68,6 +68,8 @@ echo "Removing ${INSTALL_DEST}/GHC.framework"
 rm -rf ${INSTALL_DEST}/GHC.framework
 
 echo "Removing package recipt"
+# The first is for Leopard packages and the second for Tiger packages.
 rm -f /Library/Receipts/boms/org.haskell.glasgowHaskellCompiler.ghc.pkg.bom
+rm -rf /Library/Receipts/ghc.pkg
 
 echo "${INSTALL_DEST}/GHC.framework has been purged!"