Commits

camlspotter committed 05f8b9d

camlidl quick fix

  • Participants
  • Parent commits 3874aaa

Comments (0)

Files changed (3)

File camlidl/Makefile.config

+#***********************************************************************
+#*                                                                     *
+#*                              CamlIDL                                *
+#*                                                                     *
+#*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *
+#*                                                                     *
+#*  Copyright 1999 Institut National de Recherche en Informatique et   *
+#*  en Automatique.  All rights reserved.  This file is distributed    *
+#*  under the terms of the GNU Library General Public License.         *
+#*                                                                     *
+#***********************************************************************
+
+#* $Id: Makefile.unix,v 1.4 2002/04/22 11:50:46 xleroy Exp $
+
+## Configuration section
+
+# Type of system -- do not change
+OSTYPE=unix
+
+# How to invoke the C preprocessor
+# Works on most Unix systems:
+CPP=cpp
+# Alternatives:
+# CPP=cpp
+# CPP=/usr/ccs/lib/cpp
+# CPP=gcc -x c -E
+
+# How to invoke ranlib (only relevant for Unix)
+RANLIB=ranlib
+# If ranlib is not needed:
+#RANLIB=:
+
+# Location of the Objective Caml library in your installation
+OCAMLLIB=$(PREFIX)/lib/ocaml
+
+# camlidlruntime.h is installed in $(OCAMLLIB)/$(CAML_INCLUDE_DIR)
+CAML_INCLUDE_DIR=caml
+
+# Where to install the binaries
+BINDIR=$(PREFIX)/bin/
+
+# The Objective Caml compilers (the defaults below should be OK)
+OCAMLC=ocamlc -g
+OCAMLOPT=ocamlopt
+OCAMLYACC=ocamlyacc -v
+OCAMLLEX=ocamllex
+OCAMLDEP=ocamldep
+
+# Extra flags to pass to the C compiler
+CFLAGS=-Wall -g
+
+# Suffixes for executables and libraries (do not change)
+EXE=
+LIBEXT=a
+OBJEXT=o

File camlidl/OMakefile

-# | Package name
-PACK=camlidl
-
-# | Local files and URLS required to build the package
-URLS[]=
-  http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-1.05.tar.gz
-  Makefile.config
-  META
-  install.sh
-  patch-include-dir
-
-REQUIRED_PACKS[]=
-
-##################
-
-PACKDIR=$(OCAMLFIND_DESTDIR)/$(PACK)
-
-# | Real URLS in $(URLS) which must be downloaded
-DOWNLOAD_URLS[]=$(list_filter $(fun x, $(is_url $(x))), $(URLS))
-
-# | Locally stored file paths
-LOCAL_FILES[]=$(list_filter $(fun x, $(not $(is_url $(x)))), $(URLS))
-
-# | The downloaded paths (accumulated in the following rule)
-DOWNLOAD_FILES[]=
-
-# | Downloading rules
-foreach(url, $(DOWNLOAD_URLS))
-    DOWNLOAD_FILES+=$(WGet $(url), .)
-    export
-
-# clean:
-#     rm $(DOWNLOAD_FILES)
-
-REQUIRED_INSTALLS[]=
-foreach(pack, $(REQUIRED_PACKS))
-    REQUIRED_INSTALLS+=$(Installed $(pack))
-    export
-
-# | installed/$(PACK) is the list of md5 of $(OBJS)
-$(INSTALLED)/$(PACK): $(DOWNLOAD_FILES) $(LOCAL_FILES) $(REQUIRED_INSTALLS)
-    section:
-        ./install.sh
-        objs=$(GET_OCAMLFIND_OBJS $(PACK))
-        objs=$(addprefix $(PACKDIR)/, $(objs))
-        println(Creating $@ = $(string $(objs)))
-#    chan=$(fopen $@, w)
-#    fprintln($(chan), OBJS_IN_PACKDIR[]=$(string $(objs)))
-#    close($(chan))
-#    println(Install=> $(string $(objs)))
-        CreateInstalled($(PACK), $(objs))
-
-
+URL=http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/camlidl-1.05.tar.gz
+EXTRACT_DIR=camlidl-1.05
+REQUIRED_PACKS=
+INSTALL=(cd $(EXTRACT_DIR); ../../../install.sh)
+OCamlExternalPack(camlidl)

File camlidl/install.sh

 #!/bin/sh
 
-set -e
+patch -p1 < ../../../patch-include-dir
 
-/bin/rm -rf _build
+cp ../../../Makefile.config config/Makefile
 
-mkdir _build
+make
+make install
 
-cd _build
-
-export BUILD=`pwd`
-
-mkdir -p install/caml
-
-tar zxvf ../camlidl-1.05.tar.gz
-
-cd camlidl-1.05
-
-patch -p1 < ../../patch-include-dir
-
-cp ../../Makefile.config config/Makefile
-
-BUILDDIR=$BUILD make
-BUILDDIR=$BUILD make install
-
-cd $BUILD
 ocamlfind remove camlidl
-ocamlfind install camlidl ../META `find install -type f`
+ocamlfind install camlidl ../../../META `find install -type f`
 
 # # OCaml related things are installed to a tmp dir
 # OCAML_TMP_INSTALL=`pwd`/../ocaml-libdir