aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
authorLuc Van Oostenryck <luc.vanoostenryck@gmail.com>2017-11-05 11:43:53 +0100
committerLuc Van Oostenryck <luc.vanoostenryck@gmail.com>2017-11-10 10:21:49 +0100
commit3b7d5e200ac64de2914b930933491b548b3d0bc0 (patch)
tree0135dc37b0f7ed82cae474121e13e997e8b7a451
parentc1cec55e8930a0efebb8cf4dcd1bf85aea2b8e62 (diff)
downloadsparse-dev-3b7d5e200ac64de2914b930933491b548b3d0bc0.tar.gz
build: use standard rules for install
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
-rw-r--r--Makefile35
1 files changed, 14 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index e4efefa1..afb76a99 100644
--- a/Makefile
+++ b/Makefile
@@ -168,31 +168,11 @@ QUIET_LINK = $(Q:@=@echo ' LINK '$@;)
QUIET_INST_SH = $(Q:@=echo -n ' INSTALL ';)
QUIET_INST = $(Q:@=@echo -n ' INSTALL ';)
-define INSTALL_EXEC
- $(QUIET_INST)install -v $1 $(DESTDIR)$2/$1 || exit 1;
-
-endef
-
-define INSTALL_FILE
- $(QUIET_INST)install -v -m 644 $1 $(DESTDIR)$2/$1 || exit 1;
-
-endef
-
+compile_OBJS := compile-i386.o
all: $(PROGRAMS)
-all-installable: $(INST_PROGRAMS)
-
-install: all-installable
- $(Q)install -d $(DESTDIR)$(BINDIR)
- $(Q)install -d $(DESTDIR)$(MAN1DIR)
- $(foreach f,$(INST_PROGRAMS),$(call INSTALL_EXEC,$f,$(BINDIR)))
- $(foreach f,$(INST_MAN1),$(call INSTALL_FILE,$f,$(MAN1DIR)))
-
-
-compile-objs:= compile-i386.o
-
ldflags += $($(@)-ldflags) $(LDFLAGS)
ldlibs += $($(@)-ldlibs) $(LDLIBS)
$(foreach p,$(PROGRAMS),$(eval $(p): $($(p)-objs)))
@@ -246,4 +226,17 @@ clean-check:
-o -name "*.c.error.diff" \
\) -exec rm {} \;
+
+install: $(INST_PROGRAMS) $(INST_MAN1) install-dirs install-bin install-man
+install-dirs:
+ $(Q)install -d $(DESTDIR)$(BINDIR)
+ $(Q)install -d $(DESTDIR)$(MAN1DIR)
+install-bin: $(INST_PROGRAMS:%=$(DESTDIR)$(BINDIR)/%)
+install-man: $(INST_MAN1:%=$(DESTDIR)$(MAN1DIR)/%)
+
+$(DESTDIR)$(BINDIR)/%: %
+ $(QUIET_INST)install -v $< $@ || exit 1;
+$(DESTDIR)$(MAN1DIR)/%: %
+ $(QUIET_INST)install -v -m 644 $< $@ || exit 1;
+
.PHONY: FORCE