diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-18T12·35+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-18T12·35+0100 |
| commit | 7bef965d6f191efb9c671f49fd187f4214db6120 (patch) | |
| tree | 15ec20f2b30ece8c108598e79857e0ed11767820 /programs.mk | |
| parent | 79f699edca26c035a8bcd68c7d5a13b4fbcbf3be (diff) | |
Make it work on GNU Make > 3.81 again
Diffstat (limited to 'programs.mk')
| -rw-r--r-- | programs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/programs.mk b/programs.mk index 5e27a7d62fb1..04ba282b2c75 100644 --- a/programs.mk +++ b/programs.mk @@ -28,7 +28,7 @@ define build-program $$(eval $$(call create-dir, $$(_d))) - $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d) + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/ $$(trace-ld) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $(1)_INSTALL_DIR ?= $$(bindir) @@ -42,12 +42,12 @@ define build-program _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR) + $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/ $$(trace-ld) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) else - $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_PATH) | $(DESTDIR)$$($(1)_INSTALL_DIR) + $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_PATH) | $(DESTDIR)$$($(1)_INSTALL_DIR)/ install -t $$($(1)_INSTALL_DIR) $$< endif |