diff options
Diffstat (limited to 'devel/ocaml-camlp4/files')
| -rw-r--r-- | devel/ocaml-camlp4/files/patch-Makefile | 15 | ||||
| -rw-r--r-- | devel/ocaml-camlp4/files/patch-build_install.sh | 13 |
2 files changed, 4 insertions, 24 deletions
diff --git a/devel/ocaml-camlp4/files/patch-Makefile b/devel/ocaml-camlp4/files/patch-Makefile index bf1e1fab001b..7e45c5769b8a 100644 --- a/devel/ocaml-camlp4/files/patch-Makefile +++ b/devel/ocaml-camlp4/files/patch-Makefile @@ -1,18 +1,11 @@ ---- Makefile.orig 2014-10-21 11:41:15 UTC +--- Makefile.orig 2017-10-11 20:17:38 UTC +++ Makefile -@@ -19,12 +19,12 @@ all: byte native +@@ -21,7 +21,7 @@ all: byte native .PHONY: install install: -- ./build/install.sh -+ env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) ./build/install.sh +- env DESTDIR=$(DESTDIR) sh ./build/install.sh ++ env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) sh ./build/install.sh .PHONY: install-META install-META: camlp4/META -- mkdir -p ${PKGDIR}/camlp4/ -- cp -f camlp4/META ${PKGDIR}/camlp4/ -+ mkdir -p ${DESTDIR}${PKGDIR}/camlp4/ -+ cp -f camlp4/META ${DESTDIR}${PKGDIR}/camlp4/ - - camlp4/META: camlp4/META.in - sed -e s/@@VERSION@@/${version}/g $? > $@ diff --git a/devel/ocaml-camlp4/files/patch-build_install.sh b/devel/ocaml-camlp4/files/patch-build_install.sh deleted file mode 100644 index b99f59baa514..000000000000 --- a/devel/ocaml-camlp4/files/patch-build_install.sh +++ /dev/null @@ -1,13 +0,0 @@ ---- build/install.sh.orig 2014-10-21 11:41:15 UTC -+++ build/install.sh -@@ -26,8 +26,8 @@ SAVED_LIBDIR="${LIBDIR}" - - . ./config.sh - --BINDIR="${SAVED_BINDIR:-${BINDIR}}" --LIBDIR="${SAVED_LIBDIR:-${LIBDIR}}" -+BINDIR="${DESTDIR}${SAVED_BINDIR:-${BINDIR}}" -+LIBDIR="${DESTDIR}${SAVED_LIBDIR:-${LIBDIR}}" - - not_installed=$PWD/_build/not_installed - |