diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/development/ocaml-modules/cryptokit/makefile.patch | |
parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/development/ocaml-modules/cryptokit/makefile.patch')
-rw-r--r-- | pkgs/development/ocaml-modules/cryptokit/makefile.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/development/ocaml-modules/cryptokit/makefile.patch b/pkgs/development/ocaml-modules/cryptokit/makefile.patch new file mode 100644 index 000000000000..b4a82c7d677f --- /dev/null +++ b/pkgs/development/ocaml-modules/cryptokit/makefile.patch @@ -0,0 +1,21 @@ +diff -Nuar cryptokit-1.3/Makefile cryptokit-1.3.nixos/Makefile +--- cryptokit-1.3/Makefile 2005-04-20 15:19:54.000000000 +0200 ++++ cryptokit-1.3.nixos/Makefile 2010-08-17 15:22:07.000000000 +0200 +@@ -9,14 +9,13 @@ + + # The directory containing the Zlib library (libz.a or libz.so) + # Leave blank if you don't have Zlib. +-ZLIB_LIBDIR=/usr/lib +-#ZLIB_LIBDIR=/usr/lib64 # for x86-64 Linux ++ZLIB_LIBDIR=@ZLIB_LIBDIR@ + + # The directory containing the Zlib header file (zlib.h) +-ZLIB_INCLUDE=/usr/include ++ZLIB_INCLUDE=@ZLIB_INCLUDE@ + + # Where to install the library. By default: OCaml's standard library directory. +-INSTALLDIR=`$(OCAMLC) -where` ++INSTALLDIR=@INSTALLDIR@ + + # Flags for the C compiler. + CFLAGS=-O -I$(ZLIB_INCLUDE) $(ZLIB) |