diff options
| author | Bernhard Schommer <bschommer@users.noreply.github.com> | 2019-05-17 17:30:03 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2019-05-17 17:30:03 +0200 |
| commit | 5b7fc96afb149ad916a9bf5015fe1eb2e0baaa7c (patch) | |
| tree | 03ec4c313a1b7f220e37bd924082565a0a4df6a8 | |
| parent | 99918e4118e0ea644b20e37a13ceb31d935fdda5 (diff) | |
| download | compcert-5b7fc96afb149ad916a9bf5015fe1eb2e0baaa7c.tar.gz compcert-5b7fc96afb149ad916a9bf5015fe1eb2e0baaa7c.zip | |
Prepend $(DESTDIR) to the installation target (#169)
Following the gnu Makefile Conventions the variable $(DESTDIR)
should be prepended to all installation commands. This allows
staged installs.
| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | runtime/Makefile | 8 |
2 files changed, 16 insertions, 16 deletions
@@ -235,24 +235,24 @@ depend1: $(FILES) exportclight/Clightdefs.v @$(COQDEP) $^ > .depend install: - install -d $(BINDIR) - install -m 0755 ./ccomp $(BINDIR) - install -d $(SHAREDIR) - install -m 0644 ./compcert.ini $(SHAREDIR) - install -d $(MANDIR)/man1 - install -m 0644 ./doc/ccomp.1 $(MANDIR)/man1 + install -d $(DESTDIR)$(BINDIR) + install -m 0755 ./ccomp $(DESTDIR)$(BINDIR) + install -d $(DESTDIR)$(SHAREDIR) + install -m 0644 ./compcert.ini $(DESTDIR)$(SHAREDIR) + install -d $(DESTDIR)$(MANDIR)/man1 + install -m 0644 ./doc/ccomp.1 $(DESTDIR)$(MANDIR)/man1 $(MAKE) -C runtime install ifeq ($(CLIGHTGEN),true) - install -m 0755 ./clightgen $(BINDIR) + install -m 0755 ./clightgen $(DESTDIR)$(BINDIR) endif ifeq ($(INSTALL_COQDEV),true) - install -d $(COQDEVDIR) + install -d $(DESTDIR)$(COQDEVDIR) for d in $(DIRS); do \ - install -d $(COQDEVDIR)/$$d && \ - install -m 0644 $$d/*.vo $(COQDEVDIR)/$$d/; \ + install -d $(DESTDIR)$(COQDEVDIR)/$$d && \ + install -m 0644 $$d/*.vo $(DESTDIR)$(COQDEVDIR)/$$d/; \ done - install -m 0644 ./VERSION $(COQDEVDIR) - @(echo "To use, pass the following to coq_makefile or add the following to _CoqProject:"; echo "-R $(COQDEVDIR) compcert") > $(COQDEVDIR)/README + install -m 0644 ./VERSION $(DESTDIR)$(COQDEVDIR) + @(echo "To use, pass the following to coq_makefile or add the following to _CoqProject:"; echo "-R $(COQDEVDIR) compcert") > $(DESTDIR)$(COQDEVDIR)/README endif diff --git a/runtime/Makefile b/runtime/Makefile index 27ad6e8c..8fe00934 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -70,16 +70,16 @@ clean:: ifeq ($(strip $(HAS_RUNTIME_LIB)),true) install:: - install -d $(LIBDIR) - install -m 0644 $(LIB) $(LIBDIR) + install -d $(DESTDIR)$(LIBDIR) + install -m 0644 $(LIB) $(DESTDIR)$(LIBDIR) else install:: endif ifeq ($(strip $(HAS_STANDARD_HEADERS)),true) install:: - install -d $(LIBDIR)/include - install -m 0644 $(INCLUDES) $(LIBDIR)/include + install -d $(DESTDIR)$(LIBDIR)/include + install -m 0644 $(INCLUDES) $(DESTDIR)$(LIBDIR)/include else install:: endif |