projects / packages / camlp5.git / blame
| Commit | Line | Data |
|---|---|---|
| 7a1551a7 JR |
1 | From 2865ecfe5e02f8895c555396993b49b3b08a3550 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chet Murthy <chetsky@gmail.com> | |
| 3 | Date: Fri, 15 Jan 2021 12:35:50 -0800 | |
| 4 | Subject: [PATCH] fix META file generation (DESTDIR) issue; Fix #75 | |
| 5 | ||
| 6 | --- | |
| 7 | Makefile | 2 +- | |
| 8 | etc/Makefile | 2 +- | |
| 9 | 2 files changed, 2 insertions(+), 2 deletions(-) | |
| 10 | ||
| 11 | diff --git a/Makefile b/Makefile | |
| 12 | index c9adcc46..7748ddd6 100644 | |
| 13 | --- a/Makefile | |
| 14 | +++ b/Makefile | |
| 15 | @@ -51,7 +51,7 @@ depend: | |
| 16 | ||
| 17 | local-install:: | |
| 18 | $(RM) -rf local-install && mkdir -p local-install/lib/ocaml | |
| 19 | - $(MAKE) DESTDIR=`pwd`/local-install/ LIBDIR=lib BINDIR=bin MANDIR=man install | |
| 20 | + $(MAKE) DESTDIR= LIBDIR=`pwd`/local-install/lib BINDIR=`pwd`/local-install/bin MANDIR=man install | |
| 21 | ||
| 22 | install: | |
| 23 | $(NOVERBOSE) if test -z "$(LIBDIR)"; then \ | |
| 24 | diff --git a/etc/Makefile b/etc/Makefile | |
| 25 | index ef4593cc..f8913866 100644 | |
| 26 | --- a/etc/Makefile | |
| 27 | +++ b/etc/Makefile | |
| 28 | @@ -106,7 +106,7 @@ install: | |
| 29 | -$(MKDIR) "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)" "$(DESTDIR)$(BINDIR)" | |
| 30 | $(RM) -f "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/pa_lex.cmo" | |
| 31 | cp $(OBJS) $(INSTALL_CMI) "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/." | |
| 32 | - sed -e "s|@VERSION@|$(VERSION)|" -e "s|@CAMLP5DIR@|$(DESTDIR)$(LIBDIR)/$(CAMLP5N)|" META.tpl > META | |
| 33 | + sed -e "s|@VERSION@|$(VERSION)|" -e "s|@CAMLP5DIR@|$(LIBDIR)/$(CAMLP5N)|" META.tpl > META | |
| 34 | cp META "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/." | |
| 35 | cp lib.sml "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/." | |
| 36 | cp $(CAMLP5N)o$(EXE) $(CAMLP5N)sch$(EXE) "$(DESTDIR)$(BINDIR)/." |