diff options
Diffstat (limited to 'devel/menhir/patches/patch-Makefile')
| -rw-r--r-- | devel/menhir/patches/patch-Makefile | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/devel/menhir/patches/patch-Makefile b/devel/menhir/patches/patch-Makefile index 57059612935..6dd132fee0a 100644 --- a/devel/menhir/patches/patch-Makefile +++ b/devel/menhir/patches/patch-Makefile @@ -1,7 +1,8 @@ -$NetBSD: patch-Makefile,v 1.6 2018/11/12 17:13:38 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.7 2020/01/14 22:04:26 jaapb Exp $ -Use correct install locations and BSD_INSTALL_* ---- Makefile.orig 2018-10-26 13:17:23.000000000 +0000 +Install into correct locations and use BSD_INSTALL_* + +--- Makefile.orig 2019-09-24 09:29:51.000000000 +0000 +++ Makefile @@ -46,10 +46,10 @@ endif # These may be overridden from outside; e.g., our opam package description @@ -11,30 +12,28 @@ Use correct install locations and BSD_INSTALL_* -docdir := $(PREFIX)/share/doc/menhir -libdir := $(PREFIX)/share/menhir -mandir := $(PREFIX)/share/man/man1 -+bindir := $(DESTDIR)$(PREFIX)/bin -+docdir := $(DESTDIR)$(PREFIX)/share/doc/menhir -+libdir := $(DESTDIR)$(PREFIX)/share/menhir -+mandir := $(DESTDIR)$(PREFIX)/${PKGMANDIR} ++bindir := ${DESTDIR}$(PREFIX)/bin ++docdir := ${DESTDIR}$(PREFIX)/share/doc/menhir ++libdir := ${DESTDIR}$(PREFIX)/share/menhir ++mandir := ${DESTDIR}$(PREFIX)/man/man1 MANS := doc/menhir.1 DOCS := doc/manual.pdf doc/manual.html doc/manual*.png demos - MLYLIB := src/standard.mly -@@ -177,11 +177,11 @@ endif + +@@ -176,10 +176,10 @@ endif install: # Install the executable. - mkdir -p $(bindir) - install $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE) -+ $(BSD_INSTALL_PROGRAM_DIR) -p $(bindir) -+ $(BSD_INSTALL_PROGRAM) $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE) ++ ${BSD_INSTALL_PROGRAM_DIR} $(bindir) ++ ${BSD_INSTALL_PROGRAM} $(BUILDDIR)/menhir.$(TARGET) $(bindir)/menhir$(EXE) # Install Menhir's standard library. - mkdir -p $(libdir) -- install -m 644 $(MLYLIB) $(libdir) -+ $(BSD_INSTALL_LIB_DIR) -p $(libdir) -+ $(BSD_INSTALL_DATA) -m 644 $(MLYLIB) $(libdir) ++ ${BSD_INSTALL_LIB_DIR} $(libdir) # Install MenhirLib and MenhirSdk. @if `$(BUILDDIR)/menhir.$(TARGET) --suggest-ocamlfind | tr -d '\r'` ; then \ echo 'Installing MenhirLib and MenhirSdk via ocamlfind.' ; \ -@@ -192,13 +192,13 @@ install: +@@ -190,13 +190,13 @@ install: rm -f META ; \ else \ echo 'Installing MenhirLib and MenhirSdk manually.' ; \ |