diff options
| -rw-r--r-- | contrib/bzip2/module.defs | 9 | ||||
| -rw-r--r-- | contrib/xvidcore/module.defs | 8 | ||||
| -rw-r--r-- | make/include/contrib.defs | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs index 83107cfdc..bda2a132f 100644 --- a/contrib/bzip2/module.defs +++ b/contrib/bzip2/module.defs @@ -13,14 +13,13 @@ BZIP2.BUILD.extra = \ BZIP2.BUILD.ntargets = libbz2.a define BZIP2.INSTALL - mkdir -p $(CONTRIB.build/)lib/ $(CONTRIB.build/)include/ - cp $(BZIP2.EXTRACT.dir/)libbz2.a $(CONTRIB.build/)lib/ - cp $(BZIP2.EXTRACT.dir/)bzlib.h $(CONTRIB.build/)include/ + $(CP.exe) $(BZIP2.EXTRACT.dir/)libbz2.a $(CONTRIB.build/)lib/ + $(CP.exe) $(BZIP2.EXTRACT.dir/)bzlib.h $(CONTRIB.build/)include/ $(TOUCH.exe) $@ endef define BZIP2.UNINSTALL - rm $(CONTRIB.build/)lib/libbz2.a - rm $(CONTRIB.build/)include/bzlib.h + $(RM.exe) $(CONTRIB.build/)lib/libbz2.a + $(RM.exe) $(CONTRIB.build/)include/bzlib.h $(RM.exe) -f $(BZIP2.INSTALL.target) endef diff --git a/contrib/xvidcore/module.defs b/contrib/xvidcore/module.defs index c45059b23..f25d89d77 100644 --- a/contrib/xvidcore/module.defs +++ b/contrib/xvidcore/module.defs @@ -10,13 +10,13 @@ XVIDCORE.BUILD.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/ XVIDCORE.BUILD.ntargets = libxvidcore.a define XVIDCORE.INSTALL - cp $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/ - cp $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/ + $(CP.exe) $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/ + $(CP.exe) $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/ $(TOUCH.exe) $@ endef define XVIDCORE.UNINSTALL - rm $(CONTRIB.build/)lib/libxvidcore.a - rm $(CONTRIB.build/)include/xvid.h + $(RM.exe) $(CONTRIB.build/)lib/libxvidcore.a + $(RM.exe) $(CONTRIB.build/)include/xvid.h $(RM.exe) -f $(XVIDCORE.INSTALL.target) endef diff --git a/make/include/contrib.defs b/make/include/contrib.defs index 5f0b2d224..4c344767d 100644 --- a/make/include/contrib.defs +++ b/make/include/contrib.defs @@ -126,6 +126,7 @@ define import.CONTRIB.defs $(1).INSTALL.args = !make @dir !extra !ntargets $(1).INSTALL.args.dir = -C $$(1) install + $(1).INSTALL.mkdirs = $$(CONTRIB.build/)lib/ $$(CONTRIB.build/)include/ $(1).INSTALL.target = $$($(1).build/).stamp.install define $(1).INSTALL $$(call fn.ARGS,$(1).INSTALL,$$($(1).INSTALL.args)) @@ -173,6 +174,7 @@ define import.CONTRIB.defs $(1).out += $$($(1).PATCH.target) $(1).out += $$($(1).CONFIGURE.target) $(1).out += $$($(1).BUILD.target) + $(1).out += $$($(1).INSTALL.mkdirs) $(1).out += $$($(1).INSTALL.target) BUILD.out += $$($(1).out) @@ -261,7 +263,7 @@ $($(1).name).build.untouch: ## $($(1).name).install: $$($(1).INSTALL.target) -$$($(1).INSTALL.target): | $$(dir $$($(1).INSTALL.target)) +$$($(1).INSTALL.target): | $$(dir $$($(1).INSTALL.target)) $$($(1).INSTALL.mkdirs) $$($(1).INSTALL.target): $$($(1).BUILD.target) $$($(1).INSTALL) |