fix install.sh

Author: lukaszcz

adtcont.pas.mcp

@@ -1,19 +1,19 @@
 (* This file is a part of the PascalAdt library, which provides
    commonly used algorithms and data structures for the FPC and Delphi
    compilers.
-   
+
    Copyright (C) 2004, 2005 by Lukasz Czajka
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public License
    as published by the Free Software Foundation; either version 2.1 of
    the License, or (at your option) any later version.
-   
+
    This library is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
-   
+
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -45,11 +45,11 @@ unit adtcont;
 
 { * Notes on ownership issues * }
 { When a pointer is inserted into a container it is owned by it only
-  after the insertion is successfully completed. It will be than
+  after the insertion is successfully completed. It will be then
   automatically disposed by the container. However, if an exception is
   raised the insertion is not yet completed and a pointer passed as an
   argument is not owned by the container. It must be disposed by the
-  calling code. The reason for such behaviour is not to make any any
+  calling code. The reason for such behaviour is not to make any
   user data 'sink' without trace in case of an exception. This
   eventuality should be handled with a try ... except block around
   suitable parts of code which would dispose or otherwise handle any
@@ -61,9 +61,9 @@ uses
    SysUtils, adtfunct, adtcontbase, adtiters;
 
 &include adtdefs.inc
-   
+
 &_mcp_generic_include(adtcont.i)
-   
+
 implementation
 
 uses

install.sh

@@ -120,31 +120,31 @@ else
     INCLUDE_DIR="/usr/local/include/"
 fi
 
-read -n 1 -p "Make a dynamic library? (y/n) "
-echo
-if [ "$REPLY" != n ]; then
+#read -n 1 -p "Make a dynamic library? (y/n) "
+#echo
+#if [ "$REPLY" != n ]; then
     MAKE_DYNAMIC=1
     XD="-XD"
-else
-    MAKE_DYNAMIC=0
-    XD=""
-fi
-
-read -n 1 -p "Make a smartlinked static library? (n/y) "
-echo
-if [ "$REPLY" == "y" ]; then
-    MAKE_SMART=1
-else
+#else
+#    MAKE_DYNAMIC=0
+#    XD=""
+#fi
+
+#read -n 1 -p "Make a smartlinked static library? (n/y) "
+#echo
+#if [ "$REPLY" == "y" ]; then
+#    MAKE_SMART=1
+#else
     MAKE_SMART=0
-fi
+#fi
 
-read -n 1 -p "Make a non-smartlinked static library? (n/y) "
-echo
-if [ "$REPLY" == "y" ]; then
-    MAKE_STATIC=1
-else
-    MAKE_STATIC=0
-fi
+#read -n 1 -p "Make a non-smartlinked static library? (n/y) "
+#echo
+#if [ "$REPLY" == "y" ]; then
+#    MAKE_STATIC=1
+#else
+#    MAKE_STATIC=0
+#fi
 
 read -n 1 -p "Install debug version also? (n/y) "
 echo
@@ -183,11 +183,11 @@ echo
 if [ "$REPLY" == "y" ]; then
     MCPOPTS="-dMCP_POINTER $MCPOPTS"
 fi
-read -n 1 -p "Generate template instantiations for Cardinal? (n/y) "
-echo
-if [ "$REPLY" == "y" ]; then
-    MCPOPTS="-dMCP_CARDINAL $MCPOPTS"
-fi
+#read -n 1 -p "Generate template instantiations for Cardinal? (n/y) "
+#echo
+#if [ "$REPLY" == "y" ]; then
+#    MCPOPTS="-dMCP_CARDINAL $MCPOPTS"
+#fi
 read -n 1 -p "Generate template instantiations for Real? (n/y) "
 echo
 if [ "$REPLY" == "y" ]; then
@@ -258,15 +258,15 @@ fi
 # compile and install the release version(s)
 
 if [ $MAKE_DYNAMIC == 1 ]; then
-    install_release dynamic ${DYNAMIC_LIB_STEM}${VERSION_SUFFIX}.so " " "$*" "$MCPOPTS";
+    install_release dynamic ${DYNAMIC_LIB_STEM}${VERSION_SUFFIX}.so " " "$*" "\"$MCPOPTS\"";
 fi
 
 if [ $MAKE_SMART == 1 ]; then
-    install_release smart ${STATIC_LIB_STEM}${VERSION_SUFFIX}.a "-m 644" "$*" "$MCPOPTS";
+    install_release smart ${STATIC_LIB_STEM}${VERSION_SUFFIX}.a "-m 644" "$*" "\"$MCPOPTS\"";
 fi
 
 if [ $MAKE_STATIC == 1 ]; then
-    install_release static ${STATIC_LIB_STEM}${VERSION_SUFFIX}.a "-m 644" "$*" "$MCPOPTS";
+    install_release static ${STATIC_LIB_STEM}${VERSION_SUFFIX}.a "-m 644" "$*" "\"$MCPOPTS\"";
 fi
 
 if should_overwrite_ppu "" ; then
@@ -285,7 +285,7 @@ if [ $INSTALL_DEBUG == 1 ]; then
     DEBUG_LINK_PATH=${DEBUG_LIB_DIR}${DYNAMIC_LIB_STEM}.so
     DEBUG_LIB_PATH=${DEBUG_LIB_DIR}${DYNAMIC_LIB_STEM}${VERSION_SUFFIX}.so
     checked_eval make fastclean
-    checked_eval make dynamic DEBUG=true OPTS="$*" VER="$VERSION_SUFFIX" MCP_OPTS="$MCPOPTS"
+    checked_eval make dynamic DEBUG=true OPTS="$*" VER="$VERSION_SUFFIX" MCP_OPTS="\"$MCPOPTS\""
     checked_eval install -m 644 $INSTALL_OPTS ${DYNAMIC_LIB_STEM}${VERSION_SUFFIX}.so ${DEBUG_LIB_DIR}
     if should_overwrite_ppu DEBUG_ ; then
         checked_eval install -m 664 $INSTALL_OPTS *.ppu ${DEBUG_INCLUDE_DIR}