[aprofutil] Install the tool correctly (#16112)

akoeplinger · lewing · commit b77dc06a7e74 · 2019-09-11T12:08:38.000-05:00
It needed a few tweaks to be usable when Mono is installed to the prefix.
diff --git a/man/Makefile.am b/man/Makefile.am
@@ -1,5 +1,6 @@
 man_MANS = \
 	al.1                  \
+	aprofutil.1           \
 	cert2spc.1            \
 	certmgr.1             \
 	cert-sync.1           \
diff --git a/mcs/tools/aprofutil/Makefile b/mcs/tools/aprofutil/Makefile
@@ -3,6 +3,6 @@ include ../../build/rules.make
 
 PROGRAM = aprofutil.exe
 
-LIB_REFS = System System.Core Mono.Options Mono.Profiler.Log
+LIB_REFS = System System.Core Mono.Profiler.Log
 
 include ../../build/executable.make
diff --git a/mcs/tools/aprofutil/aprofutil.csproj b/mcs/tools/aprofutil/aprofutil.csproj
@@ -44,6 +44,7 @@
   <!-- @BUILT_SOURCES@ -->
   <!--Common files-->
   <ItemGroup>
+    <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />
     <Compile Include="Program.cs" />
   </ItemGroup>
   <!--End of common files-->
@@ -52,7 +53,6 @@
   <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
     <ProjectReference Include="../../class/System/System.csproj" />
     <ProjectReference Include="../../class/System.Core/System.Core.csproj" />
-    <ProjectReference Include="../../class/Mono.Options/Mono.Options.csproj" />
     <ProjectReference Include="../../class/Mono.Profiler.Log/Mono.Profiler.Log.csproj" />
   </ItemGroup>
   <!-- @ALL_REFERENCES@ -->
diff --git a/mcs/tools/aprofutil/aprofutil.exe.sources b/mcs/tools/aprofutil/aprofutil.exe.sources
@@ -1 +1,2 @@
 Program.cs
+../../class/Mono.Options/Mono.Options/Options.cs
diff --git a/packaging/MacSDK/packaging/resources/whitelist.txt b/packaging/MacSDK/packaging/resources/whitelist.txt
@@ -1,5 +1,6 @@
 al
 al2
+aprofutil
 asp-state
 asp-state2
 asp-state4
diff --git a/scripts/.gitignore b/scripts/.gitignore
@@ -2,6 +2,7 @@
 /al
 /al1
 /al2
+/aprofutil
 /caspol
 /cert-sync
 /cert2spc
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
@@ -64,6 +64,7 @@ scripts_2_0 = \
 	wsdl2$(SCRIPT_SUFFIX)
 
 scripts_4_0 = \
+	aprofutil$(SCRIPT_SUFFIX)		\
 	disco$(SCRIPT_SUFFIX)			\
 	dtd2xsd$(SCRIPT_SUFFIX)			\
 	dtd2rng$(SCRIPT_SUFFIX)			\

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`Program.cs`
	`2`	`+../../class/Mono.Options/Mono.Options/Options.cs`