Added calls to ranlib (PR#2944)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6566 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Michel Mauny 2004-07-28 13:27:51 +00:00
parent 5bdc87c54d
commit 1041c080be
4 changed files with 22 additions and 5 deletions

View File

@ -75,8 +75,15 @@ install:
cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli "$(LIBDIR)/camlp4/." cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli "$(LIBDIR)/camlp4/."
cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi "$(LIBDIR)/camlp4/." cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi "$(LIBDIR)/camlp4/."
cp camlp4.cma $(LIBDIR)/camlp4/. cp camlp4.cma $(LIBDIR)/camlp4/.
for f in camlp4.$(A) camlp4.p.$(A) camlp4.cmxa camlp4.p.cmxa; do \ for f in camlp4.$(A) camlp4.p.$(A) ; do \
test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true; \ if test -f $$f ; then \
cp $$f "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
fi ; \
done
for f in camlp4.cmxa camlp4.p.cmxa ; do \
if test -f $$f ; then \
cp $$f "$(LIBDIR)/camlp4/." ; \
fi ; \
done done
include .depend include .depend

View File

@ -70,6 +70,7 @@ echo "O=o" >> Makefile.cnf
echo "A=a" >> Makefile.cnf echo "A=a" >> Makefile.cnf
echo "OPT=" >> Makefile.cnf echo "OPT=" >> Makefile.cnf
echo "OTOP=$ocaml_top" >> Makefile.cnf echo "OTOP=$ocaml_top" >> Makefile.cnf
grep '^RANLIB' ../../config/Makefile >> Makefile.cnf
if test "$ocaml_top" = "../ocaml_stuff"; then if test "$ocaml_top" = "../ocaml_stuff"; then
if ocamlc -v >/dev/null 2>&1; then if ocamlc -v >/dev/null 2>&1; then

View File

@ -55,6 +55,8 @@ installopt:
done done
# Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A)) # Special treatment for this one: some versions of make don't like $(A) in $(TARGET:.cma=.$(A))
target="`echo $(TARGET) | sed -e 's/\.cma$$/.$(A)/'`" ; \ target="`echo $(TARGET) | sed -e 's/\.cma$$/.$(A)/'`" ; \
test -f $$target && cp $$target "$(LIBDIR)/camlp4/." || true if test -f $$target ; then \
cp $$target "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$target ) \
fi
include .depend include .depend

View File

@ -68,8 +68,15 @@ compare:
install: install:
-$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)" -$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)"
cp odyl.cmo odyl.cma odyl_main.cmi $(LIBDIR)/camlp4/. cp odyl.cmo odyl.cma odyl_main.cmi $(LIBDIR)/camlp4/.
for f in odyl.$(A) odyl.p.$(A) odyl.cmx odyl.o odyl.p.cmx odyl.p.o odyl.cmxa odyl.p.cmxa ; do \ for f in odyl.$(A) odyl.p.$(A) ; do \
test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true; \ if test -f $$f ; then \
cp $$f "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
fi ; \
done
for f in odyl.cmx odyl.o odyl.p.cmx odyl.p.o odyl.cmxa odyl.p.cmxa ; do \
if test -f $$f ; then \
cp $$f "$(LIBDIR)/camlp4/." ; \
fi ; \
done done
include .depend include .depend