From 5b4fa31affcb4751552b717cfe5eb72c6a99460d Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 16 Oct 2012 10:11:59 +0200
Subject: use key directly from $(SRCDIR)

Change-Id: Ib1671e416fa59a46e4936ae75de4e2c20d70997b
---
 cli_ure/CustomTarget_cli_ure_assemblies.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cli_ure')

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index da66178251d1..80a8e43ab33f 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -43,20 +43,20 @@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
 	$(GNUCOPY) $< $@.tmp && \
 	echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)" )]' >> $@.tmp && \
-	$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )]' >> $@.tmp &&) \
+	$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )]' >> $@.tmp &&) \
 	mv $@.tmp $@
 
 # TODO use macros for this
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
 	$(GNUCOPY) $< $@.tmp && \
 	echo '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' >> $@.tmp && \
-	echo '[assembly:System::Reflection::AssemblyKeyFile( "$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )];' >> $@.tmp && \
+	echo '[assembly:System::Reflection::AssemblyKeyFile( "$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )];' >> $@.tmp && \
 	mv $@.tmp $@
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
 	$(GNUCOPY) $< $@.tmp && \
 	echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)" )]' >> $@.tmp && \
-	$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )]' >> $@.tmp &&) \
+	$(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )]' >> $@.tmp &&) \
 	mv $@.tmp $@
 
 # vim: set noet sw=4 ts=4:
-- 
cgit 

</option>
<option value='distro/collabora/co-22.05-testflight'>distro/collabora/co-22.05-testflight</option>
<option value='distro/collabora/co-23.05'>distro/collabora/co-23.05</option>
<option value='distro/collabora/co-24.04'>distro/collabora/co-24.04</option>
<option value='distro/collabora/co-24.04.3'>distro/collabora/co-24.04.3</option>
<option value='distro/collabora/co-24.04.4'>distro/collabora/co-24.04.4</option>
<option value='distro/collabora/co-24.04.5'>distro/collabora/co-24.04.5</option>
<option value='distro/collabora/cp-4.0'>distro/collabora/cp-4.0</option>
<option value='distro/collabora/cp-4.1'>distro/collabora/cp-4.1</option>
<option value='distro/collabora/cp-4.2'>distro/collabora/cp-4.2</option>
<option value='distro/collabora/cp-4.3'>distro/collabora/cp-4.3</option>
<option value='distro/collabora/cp-4.4'>distro/collabora/cp-4.4</option>
<option value='distro/collabora/cp-5.0'>distro/collabora/cp-5.0</option>
<option value='distro/collabora/cp-5.1'>distro/collabora/cp-5.1</option>
<option value='distro/collabora/cp-5.3'>distro/collabora/cp-5.3</option>
<option value='distro/collabora/cp-5.3-desktop'>distro/collabora/cp-5.3-desktop</option>
<option value='distro/collabora/cp-6.0'>distro/collabora/cp-6.0</option>
<option value='distro/collabora/cp-6.0-29'>distro/collabora/cp-6.0-29</option>
<option value='distro/collabora/cp-6.2'>distro/collabora/cp-6.2</option>
<option value='distro/collabora/cp-6.4'>distro/collabora/cp-6.4</option>
<option value='distro/collabora/dcm-6.2'>distro/collabora/dcm-6.2</option>
<option value='distro/collabora/dcm-7.5'>distro/collabora/dcm-7.5</option>
<option value='distro/collabora/libreoffice-4.0.6.2'>distro/collabora/libreoffice-4.0.6.2</option>
<option value='distro/collabora/libreoffice-7-5+backports'>distro/collabora/libreoffice-7-5+backports</option>
<option value='distro/collabora/libreoffice-7-6+backports'>distro/collabora/libreoffice-7-6+backports</option>
<option value='distro/collabora/lof-4.3'>distro/collabora/lof-4.3</option>
<option value='distro/collabora/lov-4.4'>distro/collabora/lov-4.4</option>
<option value='distro/collabora/lov-5.0'>distro/collabora/lov-5.0</option>
<option value='distro/collabora/lov-5.1'>distro/collabora/lov-5.1</option>
<option value='distro/collabora/lov-5.2'>distro/collabora/lov-5.2</option>
<option value='distro/collabora/lov-6.0.4'>distro/collabora/lov-6.0.4</option>
<option value='distro/collabora/lov-6.0.5'>distro/collabora/lov-6.0.5</option>
<option value='distro/collabora/lov-6.1'>distro/collabora/lov-6.1</option>
<option value='distro/collabora/lov-6.4'>distro/collabora/lov-6.4</option>
<option value='distro/collabora/viewer'>distro/collabora/viewer</option>
<option value='distro/collabora/viewer2'>distro/collabora/viewer2</option>
<option value='distro/escriba/escriba-5.2'>distro/escriba/escriba-5.2</option>
<option value='distro/escriba/escriba-5.2.1'>distro/escriba/escriba-5.2.1</option>
<option value='distro/escriba/escriba-5.4'>distro/escriba/escriba-5.4</option>
<option value='distro/lhm/libreoffice-4-1-6+backports'>distro/lhm/libreoffice-4-1-6+backports</option>
<option value='distro/lhm/libreoffice-5-2+backports'>distro/lhm/libreoffice-5-2+backports</option>
<option value='distro/lhm/libreoffice-6-1+backports'>distro/lhm/libreoffice-6-1+backports</option>
<option value='distro/lhm/libreoffice-6-4+backports'>distro/lhm/libreoffice-6-4+backports</option>
<option value='distro/lhm/libreoffice-7-0+backports'>distro/lhm/libreoffice-7-0+backports</option>
<option value='distro/lhm/libreoffice-7-1+backports'>distro/lhm/libreoffice-7-1+backports</option>
<option value='distro/lhm/libreoffice-7-2+backports'>distro/lhm/libreoffice-7-2+backports</option>
<option value='distro/lhm/libreoffice-7-3+backports'>distro/lhm/libreoffice-7-3+backports</option>
<option value='distro/lhm/libreoffice-7-4+backports'>distro/lhm/libreoffice-7-4+backports</option>
<option value='distro/lhm/libreoffice-7-5+backports'>distro/lhm/libreoffice-7-5+backports</option>
<option value='distro/lhm/libreoffice-7-6+backports'>distro/lhm/libreoffice-7-6+backports</option>
<option value='distro/mimo/mimo-4-1-4-2'>distro/mimo/mimo-4-1-4-2</option>
<option value='distro/mimo/mimo-5-4-7-2'>distro/mimo/mimo-5-4-7-2</option>
<option value='distro/mimo/mimo-6-0'>distro/mimo/mimo-6-0</option>
<option value='distro/mimo/mimo-6-1'>distro/mimo/mimo-6-1</option>
<option value='distro/mimo/mimo-6-2'>distro/mimo/mimo-6-2</option>
<option value='distro/mimo/mimo-6-3'>distro/mimo/mimo-6-3</option>
<option value='distro/mimo/mimo-6-4'>distro/mimo/mimo-6-4</option>
<option value='distro/mimo/mimo-7-0'>distro/mimo/mimo-7-0</option>
<option value='distro/mimo/mimo-7-1'>distro/mimo/mimo-7-1</option>
<option value='distro/mimo/mimo-7-2'>distro/mimo/mimo-7-2</option>
<option value='distro/mimo/mimo-7-3'>distro/mimo/mimo-7-3</option>
<option value='distro/mimo/mimo-7-4'>distro/mimo/mimo-7-4</option>
<option value='distro/mimo/mimo-7-5'>distro/mimo/mimo-7-5</option>
<option value='distro/mimo/mimo-7-6'>distro/mimo/mimo-7-6</option>
<option value='distro/nisz/libreoffice-6-4'>distro/nisz/libreoffice-6-4</option>
<option value='distro/nisz/libreoffice-7-0'>distro/nisz/libreoffice-7-0</option>
<option value='distro/nisz/libreoffice-7-1'>distro/nisz/libreoffice-7-1</option>
<option value='distro/suse/suse-3.6'>distro/suse/suse-3.6</option>
<option value='distro/suse/suse-3.6-appup'>distro/suse/suse-3.6-appup</option>
<option value='distro/suse/suse-3.6.3'>distro/suse/suse-3.6.3</option>
<option value='distro/suse/suse-4.0'>distro/suse/suse-4.0</option>
<option value='distro/suse/suse-4.0.3'>distro/suse/suse-4.0.3</option>
<option value='distro/ubuntu/oneiric-3.4'>distro/ubuntu/oneiric-3.4</option>
<option value='distro/ubuntu/oneiric-3.4-all'>distro/ubuntu/oneiric-3.4-all</option>
<option value='distro/vector/vector-24.2'>distro/vector/vector-24.2</option>
<option value='distro/vector/vector-24.2-release'>distro/vector/vector-24.2-release</option>
<option value='distro/vector/vector-5.4'>distro/vector/vector-5.4</option>
<option value='distro/vector/vector-7.0'>distro/vector/vector-7.0</option>
<option value='distro/vector/vector-7.0-10.0'>distro/vector/vector-7.0-10.0</option>
<option value='distro/vector/vector-7.5'>distro/vector/vector-7.5</option>
<option value='distro/vector/vector-7.5.9'>distro/vector/vector-7.5.9</option>
<option value='distro/vector/vector-7.5.9-release'>distro/vector/vector-7.5.9-release</option>
<option value='distro/vector/vtext-6.5'>distro/vector/vtext-6.5</option>
<option value='feature/5-1-pick'>feature/5-1-pick</option>
<option value='feature/BorderlineFix'>feature/BorderlineFix</option>
<option value='feature/OperationSmiley'>feature/OperationSmiley</option>
<option value='feature/RotGrfFlyFrame'>feature/RotGrfFlyFrame</option>
<option value='feature/RotateFlyFrame'>feature/RotateFlyFrame</option>
<option value='feature/RotateFlyFrame2'>feature/RotateFlyFrame2</option>
<option value='feature/RotateFlyFrame3'>feature/RotateFlyFrame3</option>
<option value='feature/SOSAW080'>feature/SOSAW080</option>
<option value='feature/SfxShell_refcount'>feature/SfxShell_refcount</option>
<option value='feature/SwFrameBorder'>feature/SwFrameBorder</option>
<option value='feature/accessibilitycheck'>feature/accessibilitycheck</option>
<option value='feature/accfixes2'>feature/accfixes2</option>
<option value='feature/allo_contract34185'>feature/allo_contract34185</option>
<option value='feature/allo_contract45533'>feature/allo_contract45533</option>
<option value='feature/autostyle'>feature/autostyle</option>
<option value='feature/barcode'>feature/barcode</option>
<option value='feature/base-preview'>feature/base-preview</option>
<option value='feature/benchmarks'>feature/benchmarks</option>
<option value='feature/borderline3'>feature/borderline3</option>
<option value='feature/bplustree'>feature/bplustree</option>
<option value='feature/cairo'>feature/cairo</option>
<option value='feature/calc-coordinates'>feature/calc-coordinates</option>
<option value='feature/calc-data-table'>feature/calc-data-table</option>
<option value='feature/calc-parallel'>feature/calc-parallel</option>
<option value='feature/calctiledrendering'>feature/calctiledrendering</option>
<option value='feature/calctiledrendering2'>feature/calctiledrendering2</option>
<option value='feature/calctiledrendering3'>feature/calctiledrendering3</option>
<option value='feature/calctiledrendering4'>feature/calctiledrendering4</option>
<option value='feature/calctiledrendering5'>feature/calctiledrendering5</option>
<option value='feature/calctiledrendering_alt'>feature/calctiledrendering_alt</option>
<option value='feature/calctiledrendering_attempt3'>feature/calctiledrendering_attempt3</option>
<option value='feature/calctiledrendering_attempt3_2'>feature/calctiledrendering_attempt3_2</option>
<option value='feature/calczoom'>feature/calczoom</option>
<option value='feature/chained-text-boxes'>feature/chained-text-boxes</option>
<option value='feature/change-tracking'>feature/change-tracking</option>
<option value='feature/chart-style-experiment-markus'>feature/chart-style-experiment-markus</option>
<option value='feature/chartdatatable'>feature/chartdatatable</option>
<option value='feature/cib_contract101'>feature/cib_contract101</option>
<option value='feature/cib_contract116'>feature/cib_contract116</option>
<option value='feature/cib_contract136'>feature/cib_contract136</option>
<option value='feature/cib_contract138'>feature/cib_contract138</option>
<option value='feature/cib_contract138b'>feature/cib_contract138b</option>
<option value='feature/cib_contract138c'>feature/cib_contract138c</option>
<option value='feature/cib_contract138d'>feature/cib_contract138d</option>
<option value='feature/cib_contract138e'>feature/cib_contract138e</option>
<option value='feature/cib_contract139'>feature/cib_contract139</option>
<option value='feature/cib_contract152'>feature/cib_contract152</option>
<option value='feature/cib_contract152b'>feature/cib_contract152b</option>
<option value='feature/cib_contract3197'>feature/cib_contract3197</option>
<option value='feature/cib_contract3753'>feature/cib_contract3753</option>
<option value='feature/cib_contract3756'>feature/cib_contract3756</option>
<option value='feature/cib_contract3756b'>feature/cib_contract3756b</option>
<option value='feature/cib_contract4236'>feature/cib_contract4236</option>
<option value='feature/cib_contract4236b'>feature/cib_contract4236b</option>
<option value='feature/cib_contract49'>feature/cib_contract49</option>
<option value='feature/cib_contract49b'>feature/cib_contract49b</option>
<option value='feature/cib_contract49c'>feature/cib_contract49c</option>
<option value='feature/cib_contract561'>feature/cib_contract561</option>
<option value='feature/cib_contract57'>feature/cib_contract57</option>
<option value='feature/cib_contract57b'>feature/cib_contract57b</option>
<option value='feature/cib_contract57c'>feature/cib_contract57c</option>
<option value='feature/cib_contract57d'>feature/cib_contract57d</option>
<option value='feature/cib_contract57d+hotfix'>feature/cib_contract57d+hotfix</option>
<option value='feature/cib_contract57d_p1'>feature/cib_contract57d_p1</option>
<option value='feature/cib_contract57e'>feature/cib_contract57e</option>
<option value='feature/cib_contract57l'>feature/cib_contract57l</option>
<option value='feature/cib_contract6721b'>feature/cib_contract6721b</option>
<option value='feature/cib_contract6721c'>feature/cib_contract6721c</option>
<option value='feature/cib_contract7409'>feature/cib_contract7409</option>
<option value='feature/cib_contract8161'>feature/cib_contract8161</option>
<option value='feature/cib_contract891'>feature/cib_contract891</option>
<option value='feature/cib_contract891b'>feature/cib_contract891b</option>
<option value='feature/cib_contract891c'>feature/cib_contract891c</option>
<option value='feature/cib_contract935'>feature/cib_contract935</option>
<option value='feature/cib_contract935b'>feature/cib_contract935b</option>
<option value='feature/clipboard'>feature/clipboard</option>
<option value='feature/cmis'>feature/cmis</option>
<option value='feature/components'>feature/components</option>
<option value='feature/controlstate'>feature/controlstate</option>
<option value='feature/coretext'>feature/coretext</option>
<option value='feature/coverrest-featuretests'>feature/coverrest-featuretests</option>
<option value='feature/cp-5.0-cairo-svp'>feature/cp-5.0-cairo-svp</option>
<option value='feature/cpu_intrinsics_support'>feature/cpu_intrinsics_support</option>
<option value='feature/custom-widgets'>feature/custom-widgets</option>
<option value='feature/dataprovider'>feature/dataprovider</option>
<option value='feature/debugevent'>feature/debugevent</option>
<option value='feature/dematurize01'>feature/dematurize01</option>
<option value='feature/dialog-screenshots'>feature/dialog-screenshots</option>
<option value='feature/docking_windows'>feature/docking_windows</option>
<option value='feature/docx-commentsex'>feature/docx-commentsex</option>
<option value='feature/drawinglayercore'>feature/drawinglayercore</option>
<option value='feature/drawinglayercore2'>feature/drawinglayercore2</option>
<option value='feature/droid_calcimpress3'>feature/droid_calcimpress3</option>
<option value='feature/droid_calimpress4'>feature/droid_calimpress4</option>
<option value='feature/drop-findcmap'>feature/drop-findcmap</option>
<option value='feature/editviewoverlay'>feature/editviewoverlay</option>
<option value='feature/eszka'>feature/eszka</option>
<option value='feature/extended-tooltips'>feature/extended-tooltips</option>
<option value='feature/external-data-ui'>feature/external-data-ui</option>
<option value='feature/fastparser'>feature/fastparser</option>
<option value='feature/firebird-sdbc'>feature/firebird-sdbc</option>
<option value='feature/firebird-sdbc2'>feature/firebird-sdbc2</option>
<option value='feature/firebird-sdbc3'>feature/firebird-sdbc3</option>
<option value='feature/fixstyles3'>feature/fixstyles3</option>
<option value='feature/fontsubtitutions'>feature/fontsubtitutions</option>
<option value='feature/foo'>feature/foo</option>
<option value='feature/gbuild_cli'>feature/gbuild_cli</option>
<option value='feature/gccwrapper'>feature/gccwrapper</option>
<option value='feature/glyphy'>feature/glyphy</option>
<option value='feature/go2'>feature/go2</option>
<option value='feature/gpg4libre'>feature/gpg4libre</option>
<option value='feature/gpg4libre-5-4'>feature/gpg4libre-5-4</option>
<option value='feature/gpg4libre-6-0'>feature/gpg4libre-6-0</option>
<option value='feature/gpg4libre2'>feature/gpg4libre2</option>
<option value='feature/graphicobject'>feature/graphicobject</option>
<option value='feature/gsoc-basic-ide-completion-and-other-bits'>feature/gsoc-basic-ide-completion-and-other-bits</option>
<option value='feature/gsoc-calc-enhanced-db-range'>feature/gsoc-calc-enhanced-db-range</option>
<option value='feature/gsoc-svm-writer'>feature/gsoc-svm-writer</option>
<option value='feature/gsoc-uitest-2019'>feature/gsoc-uitest-2019</option>
<option value='feature/gsoc14-colors'>feature/gsoc14-colors</option>
<option value='feature/gsoc14-draw-chained-text-boxes'>feature/gsoc14-draw-chained-text-boxes</option>
<option value='feature/gsoc14-draw-text-background-color'>feature/gsoc14-draw-text-background-color</option>
<option value='feature/gsoc14-libcmis'>feature/gsoc14-libcmis</option>
<option value='feature/gsoc14-libcmis2'>feature/gsoc14-libcmis2</option>
<option value='feature/gsoc14-personas'>feature/gsoc14-personas</option>
<option value='feature/gsoc14-personas2'>feature/gsoc14-personas2</option>
<option value='feature/gsoc15-online-update'>feature/gsoc15-online-update</option>
<option value='feature/gsoc15-open-remote-files-dialog'>feature/gsoc15-open-remote-files-dialog</option>
<option value='feature/gsoc17-revamp-customize-dialog'>feature/gsoc17-revamp-customize-dialog</option>
<option value='feature/gsoc19-chart-style'>feature/gsoc19-chart-style</option>
<option value='feature/gsoc2011_wizards'>feature/gsoc2011_wizards</option>
<option value='feature/gsoc24-lua'>feature/gsoc24-lua</option>
<option value='feature/gtk3_kde5'>feature/gtk3_kde5</option>
<option value='feature/gtk3nativedialogs'>feature/gtk3nativedialogs</option>
<option value='feature/gtktiledviewer'>feature/gtktiledviewer</option>
<option value='feature/ia2'>feature/ia2</option>
<option value='feature/ia2.2'>feature/ia2.2</option>
<option value='feature/ia2.3'>feature/ia2.3</option>
<option value='feature/ia2.4'>feature/ia2.4</option>
<option value='feature/ia2.5'>feature/ia2.5</option>
<option value='feature/improvexlsximport'>feature/improvexlsximport</option>
<option value='feature/instdirlinktargets'>feature/instdirlinktargets</option>
<option value='feature/item_refactor2'>feature/item_refactor2</option>
<option value='feature/jsdialogs'>feature/jsdialogs</option>
<option value='feature/jssidebar'>feature/jssidebar</option>
<option value='feature/lfrb-vcl-opengl'>feature/lfrb-vcl-opengl</option>
<option value='feature/libffi'>feature/libffi</option>
<option value='feature/lok-calc-rtl'>feature/lok-calc-rtl</option>
<option value='feature/lok-clipboard'>feature/lok-clipboard</option>
<option value='feature/lok_cellcursor'>feature/lok_cellcursor</option>
<option value='feature/lok_dialog'>feature/lok_dialog</option>
<option value='feature/lok_dialog-backport