diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-06 16:36:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-07 14:27:50 -0600 |
| commit | b8002169336b6b7597d32755e41fa3dc2688539e (patch) | |
| tree | dde6d4ce209e09aa2140575aa1f8386144f76af6 /postprocess | |
| parent | 7fb73e6c30e66f028fe759376e3789456bf3ad33 (diff) | |
remove INPATH and PROEXT
- WORKDIR path is just workdir
- INSTDIR path is just instdir
- WORKDIR_FOR_BUILD is workdir_for_build
- INSTDIR_FOR_BUILD is instdir_for_build
- replace other usage of INPATH by combination of OS and CPUNAME
Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482
Reviewed-on: https://gerrit.libreoffice.org/6601
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 37b81df86811..e66a015b75a6 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -61,8 +61,8 @@ $(packimages_DIR)/commandimagelist.ilst : $(call gb_Helper_abbreviate_dirs, \ find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \ sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \ - LC_ALL=C sort > $@.$(INPATH) && \ - $(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.$(INPATH) $@ \ + LC_ALL=C sort > $@.tmp && \ + $(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.tmp $@ \ $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) $(packimages_DIR)/sorted.lst : \ |