diff options
Diffstat (limited to 'x11/lablgtk/patches/patch-src_Makefile')
| -rw-r--r-- | x11/lablgtk/patches/patch-src_Makefile | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/x11/lablgtk/patches/patch-src_Makefile b/x11/lablgtk/patches/patch-src_Makefile index 20abeb65b7e..19b2e8dbeb7 100644 --- a/x11/lablgtk/patches/patch-src_Makefile +++ b/x11/lablgtk/patches/patch-src_Makefile @@ -1,31 +1,18 @@ -$NetBSD: patch-src_Makefile,v 1.2 2012/09/10 05:33:25 jaapb Exp $ +$NetBSD: patch-src_Makefile,v 1.3 2013/11/01 21:41:45 jaapb Exp $ -Support DESTDIR when installing ---- src/Makefile.orig 2012-08-23 10:37:48.000000000 +0000 +Do not create an ld.conf, this is done afterwards through the PLIST +--- src/Makefile.orig 2013-10-01 08:31:50.000000000 +0000 +++ src/Makefile -@@ -391,7 +391,9 @@ old-uninstall: - # Install using ocamlfind - findlib-install: +@@ -395,10 +395,10 @@ findlib-install: + exit 2; fi mkdir -p "$(BINDIR)" -- ocamlfind install lablgtk2 ../META \ -+ ocamlfind install -destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib \ -+ -ldconf /var/null lablgtk2 \ -+ ../META \ + mkdir -p "$(DESTDIR)$(FINDLIBDIR)" +- @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \ ++# @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \ + touch "$(DESTDIR)$(OCAMLLDCONF)"; fi + $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \ +- -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \ ++ -ldconf ignore \ + lablgtk2 ../META \ build.ml \ $(CLIBS) \ - $(ALLOBJS:.cmo=.cmi) $(EXTRA_OBJS:.cmo=.cmi) \ -@@ -427,11 +429,11 @@ findlib-install: - then \ - echo $(CLIBS:lib%$(XA)=dll%$(XA)) ; \ - fi` -- $(RANLIB) $(CLIBS:%="`ocamlfind query lablgtk2 | tr -d '\r'`"/%) -+ $(RANLIB) $(CLIBS:%=${DESTDIR}${PREFIX}/lib/ocaml/site-lib/lablgtk2/%) - @if test -f lablgtk.cmxa; \ -- then ($(RANLIB) $(MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) $(EXTRA_MLLIBS:%.cma="`ocamlfind query lablgtk2 | tr -d '\r'`"/%$(XA)) ); fi -+ then ($(RANLIB) $(MLLIBS:%.cma=${DESTDIR}${PREFIX}/lib/ocaml/site-lib/lablgtk2/%$(XA)) $(EXTRA_MLLIBS:%.cma=${DESTDIR}${PREFIX}/lib/ocaml/site-lib/lablgtk2/%$(XA)) ); fi - rm lablgtk2$(XB) -- $(MAKE) INSTALLDIR=`ocamlfind query lablgtk2 | tr -d '\r'` lablgtk2$(XB) -+ $(MAKE) INSTALLDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib/lablgtk2 lablgtk2$(XB) - cp lablgtk2$(XB) "$(BINDIR)" - if test -f lablgladecc$(XE); then \ - cp lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \ |