4 files changed, 15 insertions, 23 deletions
diff --git a/camlp4/lib/plexer.ml b/camlp4/lib/plexer.ml
index 3aeedd217..7a4fb635c 100644
--- a/camlp4/lib/plexer.ml
+++ b/camlp4/lib/plexer.ml
@@ -166,9 +166,8 @@ value next_token_fun dfa ssd find_kwd fname lnum bolpos glexr =
    let make_pos p =
      {Lexing.pos_fname = fname.val; Lexing.pos_lnum = lnum.val;
       Lexing.pos_bol = bolpos.val; Lexing.pos_cnum = p} in
-   let mkloc (bp, ep) = let (_, loc) =
-     check_location "mkloc@Plexer" (make_pos bp, make_pos ep) in loc in
-  let keyword_or_error (bp,ep) s =
+   let mkloc (bp, ep) = (make_pos bp, make_pos ep) in
+   let keyword_or_error (bp,ep) s =
     let loc = mkloc (bp, ep) in
       try (("", find_kwd s), loc) with
       [ Not_found ->
diff --git a/camlp4/ocaml_src/lib/Makefile b/camlp4/ocaml_src/lib/Makefile
index e19e52052..9119b7aa9 100644
--- a/camlp4/ocaml_src/lib/Makefile
+++ b/camlp4/ocaml_src/lib/Makefile
@@ -43,6 +43,6 @@ install:
 
 installopt:
 	cp $(TARGET:.cma=.cmxa) *.cmx "$(LIBDIR)/camlp4/."
-	tar cf - $(TARGET:.cma=.$(A)) | (cd "$(LIBDIR)/camlp4/."; tar xf -)
+	TARG=`echo "$(TARGET)" | sed -e "s/\.cma\$$/.$(A)/g"` && tar cf - $$TARG | (cd "$(LIBDIR)/camlp4/." && tar xf -)
 
 include .depend
diff --git a/camlp4/ocaml_src/lib/plexer.ml b/camlp4/ocaml_src/lib/plexer.ml
index e781568a3..43d5c8d95 100644
--- a/camlp4/ocaml_src/lib/plexer.ml
+++ b/camlp4/ocaml_src/lib/plexer.ml
@@ -180,10 +180,7 @@ let next_token_fun dfa ssd find_kwd fname lnum bolpos glexr =
     {Lexing.pos_fname = !fname; Lexing.pos_lnum = !lnum;
      Lexing.pos_bol = !bolpos; Lexing.pos_cnum = p}
   in
-  let mkloc (bp, ep) =
-    let (_, loc) = check_location "mkloc@Plexer" (make_pos bp, make_pos ep) in
-    loc
-  in
+  let mkloc (bp, ep) = make_pos bp, make_pos ep in
   let keyword_or_error (bp, ep) s =
     let loc = mkloc (bp, ep) in
     try ("", find_kwd s), loc with
@@ -1045,11 +1042,11 @@ let gmake () =
   let id_table = Hashtbl.create 301 in
   let glexr =
     ref
-      {tok_func = (fun _ -> raise (Match_failure ("", 742, 17)));
-       tok_using = (fun _ -> raise (Match_failure ("", 742, 37)));
-       tok_removing = (fun _ -> raise (Match_failure ("", 742, 60)));
-       tok_match = (fun _ -> raise (Match_failure ("", 743, 18)));
-       tok_text = (fun _ -> raise (Match_failure ("", 743, 37)));
+      {tok_func = (fun _ -> raise (Match_failure ("", 741, 17)));
+       tok_using = (fun _ -> raise (Match_failure ("", 741, 37)));
+       tok_removing = (fun _ -> raise (Match_failure ("", 741, 60)));
+       tok_match = (fun _ -> raise (Match_failure ("", 742, 18)));
+       tok_text = (fun _ -> raise (Match_failure ("", 742, 37)));
        tok_comm = None}
   in
   let glex =
@@ -1079,11 +1076,11 @@ let make () =
   let id_table = Hashtbl.create 301 in
   let glexr =
     ref
-      {tok_func = (fun _ -> raise (Match_failure ("", 771, 17)));
-       tok_using = (fun _ -> raise (Match_failure ("", 771, 37)));
-       tok_removing = (fun _ -> raise (Match_failure ("", 771, 60)));
-       tok_match = (fun _ -> raise (Match_failure ("", 772, 18)));
-       tok_text = (fun _ -> raise (Match_failure ("", 772, 37)));
+      {tok_func = (fun _ -> raise (Match_failure ("", 770, 17)));
+       tok_using = (fun _ -> raise (Match_failure ("", 770, 37)));
+       tok_removing = (fun _ -> raise (Match_failure ("", 770, 60)));
+       tok_match = (fun _ -> raise (Match_failure ("", 771, 18)));
+       tok_text = (fun _ -> raise (Match_failure ("", 771, 37)));
        tok_comm = None}
   in
   {func = func kwd_table glexr; using = using_token kwd_table id_table;
diff --git a/camlp4/ocaml_src/meta/Makefile b/camlp4/ocaml_src/meta/Makefile
index 3b0165935..d0b3cd519 100644
--- a/camlp4/ocaml_src/meta/Makefile
+++ b/camlp4/ocaml_src/meta/Makefile
@@ -49,11 +49,7 @@ install:
 	cp camlp4r$(EXE) "$(BINDIR)/."
 	if test -f camlp4r.opt; then \
 	  cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\
-	  for target in $(OBJSX) $(OBJSX:.cmx=.$(O)) ; do \
-	    if test -f $$target; then \
-	      cp $$target "$(LIBDIR)/camlp4/."; \
-	    fi; \
-	  done; \
+	  cp $(OBJSX) $(OBJSX:.cmx=.$(O)) "$(LIBDIR)/camlp4/."; \
 	fi
 
 include .depend