From d528b812ae1dae814b372a1e0985fc6bb3b43326 Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Wed, 16 Nov 2016 10:59:57 +0100
Subject: [PATCH] better hack for removing stale .vo files on 'make install'
use sed to patch Makefile directly
---
Makefile | 11 +++--------
Makefile.uninstall | 27 ---------------------------
2 files changed, 3 insertions(+), 35 deletions(-)
delete mode 100644 Makefile.uninstall
diff --git a/Makefile b/Makefile
index 9ebb201d6..f0a392c80 100644
--- a/Makefile
+++ b/Makefile
@@ -10,14 +10,9 @@ clean: Makefile.coq
+@make -f Makefile.coq clean
rm -f Makefile.coq
-uninstall:
- +@make -f Makefile.uninstall uninstall
-
-install: Makefile.coq uninstall
- +@make -f Makefile.coq install
-
Makefile.coq: _CoqProject Makefile
- coq_makefile -f _CoqProject | sed 's/$$(COQCHK) $$(COQCHKFLAGS) $$(COQLIBS)/$$(COQCHK) $$(COQCHKFLAGS) $$(subst -Q,-R,$$(COQLIBS))/' > Makefile.coq
+ coq_makefile -f _CoqProject | sed 's/$$(COQCHK) $$(COQCHKFLAGS) $$(COQLIBS)/$$(COQCHK) $$(COQCHKFLAGS) $$(subst -Q,-R,$$(COQLIBS))/' \
+ | sed '/^install:$$/a \\tif [ -d "$$(DSTROOT)"$$(COQLIBINSTALL)/iris/ ]; then find "$$(DSTROOT)"$$(COQLIBINSTALL)/iris/ -name "*.vo" -print -delete; fi' > Makefile.coq
_CoqProject: ;
@@ -25,4 +20,4 @@ Makefile: ;
phony: ;
-.PHONY: all clean install uninstall phony
+.PHONY: all clean phony
diff --git a/Makefile.uninstall b/Makefile.uninstall
deleted file mode 100644
index 3fb57d5ae..000000000
--- a/Makefile.uninstall
+++ /dev/null
@@ -1,27 +0,0 @@
-## This makefile does some pretty heavy manipualtion of variables,
-## which we don't want in our main Makefile. That's why it is
-## in a separate file.
-
-## BEGIN things copied from Makefile.coq
-# Here is a hack to make $(eval $(shell works:
-define donewline
-
-
-endef
-includecmdwithout@ = $(eval $(subst @,$(donewline),$(shell { $(1) | tr -d '\r' | tr '\n' '@'; })))
-$(call includecmdwithout@,$(COQBIN)coqtop -config)
-
-ifdef USERINSTALL
-XDG_DATA_HOME?="$(HOME)/.local/share"
-COQLIBINSTALL=$(XDG_DATA_HOME)/coq
-COQDOCINSTALL=$(XDG_DATA_HOME)/doc/coq
-else
-COQLIBINSTALL="${COQLIB}user-contrib"
-COQDOCINSTALL="${DOCDIR}user-contrib"
-COQTOPINSTALL="${COQLIB}toploop"
-endif
-
-## End things copied from Makefile.coq
-
-uninstall:
- if [ -d "$(DSTROOT)"$(COQLIBINSTALL)/iris/ ]; then find "$(DSTROOT)"$(COQLIBINSTALL)/iris/ -name "*.vo" -print -delete; fi
--
GitLab