summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/camlzip/makefile_1_05.patch
blob: 87d0c8bec3346db090b8dfa984855ebe4b586741 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
diff -Nuar camlzip-1.04/Makefile camlzip-1.04.nixpkgs/Makefile
--- camlzip-1.04/Makefile	2002-04-22 17:28:57.000000000 +0200
+++ camlzip-1.04.nixpkgs/Makefile	2010-12-12 18:30:49.000000000 +0100
@@ -4,14 +4,10 @@
 ZLIB_LIB=-lz
 
 # The directory containing the Zlib library (libz.a or libz.so)
-ZLIB_LIBDIR=/usr/local/lib
+ZLIB_LIBDIR=@ZLIB_LIBDIR@
 
 # The directory containing the Zlib header file (zlib.h)
-ZLIB_INCLUDE=/usr/local/include
-
-# Where to install the library.  By default: sub-directory 'zip' of
-# OCaml's standard library directory.
-INSTALLDIR=`$(OCAMLC) -where`/zip
+ZLIB_INCLUDE=@ZLIB_INCLUDE@
 
 ### End of configuration section
 
@@ -19,10 +15,13 @@
 OCAMLOPT=ocamlopt
 OCAMLDEP=ocamldep
 OCAMLMKLIB=ocamlmklib
+OCAMLFIND=ocamlfind 
 
 OBJS=zlib.cmo zip.cmo gzip.cmo
 C_OBJS=zlibstubs.o
 
+LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.a *.so)
+
 all: libcamlzip.a zip.cma
 
 allopt: libcamlzip.a zip.cmxa
@@ -55,18 +54,7 @@
 	rm -f *.o *.a
 
 install:
-	mkdir -p $(INSTALLDIR)
-	cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR)
-	if test -f dllcamlzip.so; then \
-	  cp dllcamlzip.so $(INSTALLDIR); \
-          ldconf=`$(OCAMLC) -where`/ld.conf; \
-          installdir=$(INSTALLDIR); \
-          if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \
-          then echo $$installdir >> $$ldconf; fi \
-        fi
-
-installopt:
-	cp zip.cmxa zip.a zip.cmx gzip.cmx $(INSTALLDIR)
+	$(OCAMLFIND) install zip META $(LIBINSTALL_FILES)
 
 depend:
 	gcc -MM -I$(ZLIB_INCLUDE) *.c > .depend