Improved detection of options

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7294 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 6 insertions, 8 deletions

diff --git a/camlp4/etc/mkcamlp4.sh.tpl b/camlp4/etc/mkcamlp4.sh.tpl
index 995ad5bac..020e8fa89 100755
--- a/camlp4/etc/mkcamlp4.sh.tpl
+++ b/camlp4/etc/mkcamlp4.sh.tpl
@@ -13,15 +13,13 @@ while test "" != "$1"; do
     case "$1" in
     -I) INCL="$INCL -I $2"; shift;;
     -version) echo "mkcamlp4, version $VERSION"; exit;;
-    *)
+    [a-zA-Z]*.cmi)
         j=`basename "$1" .cmi`
-        if test "$j.cmi" = "$1"; then
-            first="`expr "$j" : '\(.\)' | tr 'a-z' 'A-Z'`"
-            rest="`expr "$j" : '.\(.*\)'`"
-            INTERFACES="$INTERFACES $first$rest"
-        else
-            OPTS="$OPTS $1"
-        fi;;
+        first="`expr "$j" : '\(.\)' | tr 'a-z' 'A-Z'`"
+        rest="`expr "$j" : '.\(.*\)'`"
+        INTERFACES="$INTERFACES $first$rest"
+        ;;
+    *) OPTS="$OPTS $1";;
     esac
     shift
 done