diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 14:43:36 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-20 14:43:59 +0200 |
| commit | 0a5fe3833e03582896ff2db81018ef1dff3a30b8 (patch) | |
| tree | 0bf0b437784246441167d4089f11ff1b6a54718b /desktop | |
| parent | I think this is supposed to be a so-called GUI executable (diff) | |
| download | core-0a5fe3833e03582896ff2db81018ef1dff3a30b8.tar.gz core-0a5fe3833e03582896ff2db81018ef1dff3a30b8.zip | |
Fix manifest creation.
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Package_manifest.mk | 4 | ||||
| -rw-r--r-- | desktop/util/Makefile | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk index a6a3a7296e96..4c36f02cb044 100644 --- a/desktop/Package_manifest.mk +++ b/desktop/Package_manifest.mk @@ -28,9 +28,9 @@ $(eval $(call gb_Package_Package,desktop_manifest,$(WORKDIR)/CustomTarget/deskto $(eval $(call gb_Package_add_customtarget,desktop_manifest,desktop/util,SRCDIR)) $(eval $(call gb_CustomTarget_add_outdir_dependencies,desktop/util,\ - $(OUTDIR)/bin/soffice.exe \ + $(OUTDIR)/bin/soffice.bin \ )) -$(eval $(call gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.exe.manifest,soffice.exe.manifest)) +$(eval $(call gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.bin.manifest,soffice.bin.manifest)) # vim: set ts=4 sw=4 et: diff --git a/desktop/util/Makefile b/desktop/util/Makefile index 4dc649efad34..5e72a4109e9b 100644 --- a/desktop/util/Makefile +++ b/desktop/util/Makefile @@ -23,18 +23,25 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -include $(GBUILDDIR)/gbuild_simple.mk - DESTDIR := $(WORKDIR)/CustomTarget/desktop/util -$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice.exe +ifeq ($(COM),MSC) + +$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice.bin mkdir -p $(DESTDIR) && mt.exe -inputresource:$< -out:$@ -$(DESTDIR)/soffice.exe.manifest : $(DESTDIR)/linker.manifest template.manifest - mkdir -p $(DESTDIR) && mt.exe -manifest $^ -out:$@ +$(OUTDIR)/bin/soffice.bin.manifest : $(DESTDIR)/linker.manifest $(SRCDIR)/desktop/util/template.manifest + mkdir -p $(OUTDIR)/bin && mt.exe -manifest $^ -out:$@ + +else + +$(OUTDIR)/bin/soffice.bin.manifest : $(SRCDIR)/desktop/util/template.manifest + mkdir -p $(OUTDIR)/bin && cp $^ $@ + +endif .DEFAULT_TARGET := all .PHONY : all -all : $(DESTDIR)/soffice.exe.manifest +all : $(OUTDIR)/bin/soffice.bin.manifest # vim: set ts=4 sw=4 noet: |