summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun FURUSE / 古瀬 淳 <jun.furuse@gmail.com>2002-05-06 14:24:50 +0000
committerJun FURUSE / 古瀬 淳 <jun.furuse@gmail.com>2002-05-06 14:24:50 +0000
commit6e84e24444c99201dd873e86bbfdf787d475f49a (patch)
treef53006980a7861f4e1acd74c99dbe0ba18055320
parent4dbcb122ae8780f8fdc033f6e2b5720cb51fbfeb (diff)
install never makes
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4777 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--otherlibs/labltk/lib/Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile
index f2ba52562..b61bfdefc 100644
--- a/otherlibs/labltk/lib/Makefile
+++ b/otherlibs/labltk/lib/Makefile
@@ -28,14 +28,16 @@ TKOBJS=$(SUPPORT) $(LABLTKOBJS) $(CAMLTKOBJS)
TOPDEPS = $(TOPDIR)/toplevel/toplevellib.cma $(TOPDIR)/toplevel/topmain.cmo
-$(LIBNAME).cma: superclean $(SUPPORT)
+$(LIBNAME).cma: $(SUPPORT)
+ $(MAKE) superclean
cd ../labltk; $(MAKE)
cd ../camltk; $(MAKE)
$(MKLIB) -ocamlc '$(CAMLC)' -o $(LIBNAME) -oc $(LIBNAME) \
-I ../labltk -I ../camltk $(TKOBJS) \
$(TK_LINK) $(X11_LINK)
-$(LIBNAME).cmxa: superclean $(SUPPORT:.cmo=.cmx)
+$(LIBNAME).cmxa: $(SUPPORT:.cmo=.cmx)
+ $(MAKE) superclean
cd ../labltk; $(MAKE) opt
cd ../camltk; $(MAKE) opt
$(MKLIB) -ocamlopt '$(CAMLOPT)' -o $(LIBNAME) -oc $(LIBNAME) \
@@ -56,7 +58,7 @@ $(LIBNAME): Makefile $(TOPDIR)/config/Makefile
@echo "#!/bin/sh" > $@
@echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) $$*' >> $@
-install: all
+install:
if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
if test `grep -s -c '^$(INSTALLDIR)$$' $(LIBDIR)/ld.conf || :` = 0; \
then echo $(INSTALLDIR) >> $(LIBDIR)/ld.conf; fi
@@ -67,7 +69,7 @@ install: all
cp $(LIBNAME) $(BINDIR)
chmod 755 $(BINDIR)/$(LIBNAME)
-installopt: opt
+installopt:
@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
cp $(LIBNAME).cmxa $(LIBNAME).a $(INSTALLDIR)
cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).a