diff options
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | otherlibs/labltk/lib/Makefile | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -924,7 +924,8 @@ fi if test $has_tk = true; then echo "TK_DEFS=$tk_defs" >> Makefile - echo "TK_LINK=$tk_libs" | sed -e 's/-[lL]/-cclib &/g' >> Makefile + echo "TK_LINK=$tk_libs" \ + | sed -e 's/-l/-cclib &/g' -e 's/-L/-ccopt &/g' >> Makefile otherlibraries="$otherlibraries labltk" else echo "Configuration failed, LablTk will not be built." diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile index 1962be9c3..1f54cbed5 100644 --- a/otherlibs/labltk/lib/Makefile +++ b/otherlibs/labltk/lib/Makefile @@ -37,12 +37,12 @@ labltk: Makefile $(TOPDIR)/config/Makefile labltklink: Makefile $(TOPDIR)/config/Makefile @echo Generate $@ @echo "#!/bin/sh" > $@ - @echo 'exec ocamlc -I $(LABLTKDIR) -cclib -L$(LABLTKDIR) tk41.cma "$$@"' >> $@ + @echo 'exec ocamlc -I $(LABLTKDIR) -ccopt -L$(LABLTKDIR) tk41.cma "$$@"' >> $@ labltkopt: Makefile $(TOPDIR)/config/Makefile @echo Generate $@ @echo "#!/bin/sh" > $@ - @echo 'exec ocamlopt -I $(LABLTKDIR) -cclib -L$(LABLTKDIR) tk41.cmxa "$$@" ' >> $@ + @echo 'exec ocamlopt -I $(LABLTKDIR) -ccopt -L$(LABLTKDIR) tk41.cmxa "$$@" ' >> $@ # All .{ml,mli} files are generated in this directory clean : |