working towards proper noarch dotnet RPM and proper assembly installation.

1 files changed, 9 insertions, 5 deletions

diff --git a/cpp/makebindist.py b/cpp/makebindist.py
index 87f7e66b007..7b4702e323d 100755
--- a/cpp/makebindist.py
+++ b/cpp/makebindist.py
@@ -482,9 +482,17 @@ def makeInstall(sources, buildDir, installDir, distro, clean, version):
 
     if distro.startswith('IceCS'):
 	assemblies = ["glacier2cs", "iceboxcs", "icecs", "icegridcs", "icepatch2cs", "icestormcs"]
+
+	# 
+	# We are relying on pkgconfig to deal with some mono library
+	# configuration, so we need to copy these files into place.
+	#
+	if not os.path.exists("%s/lib/pkgconfig" % installDir):
+	    os.makedirs("%s/lib/pkgconfig" % installDir)
+
 	for a in assemblies:
 	    shutil.copy("bin/%s.dll" % a, "%s/bin/%s.dll" % (installDir, a))
-	shutil.copy("bin/iceboxnet.exe", "%s/bin/iceboxnet.exe" % installDir)
+	    shutil.copy("lib/pkgconfig/%s.pc" % a, "%s/lib/pkgconfig" % installDir)
 
     os.chdir(cwd)
     
@@ -1093,10 +1101,6 @@ def main():
     cwd = os.getcwd()
     os.chdir(installDir)
 
-    #
-    # XXX- make configurable.
-    #
-
     if not getPlatform().startswith('linux'):
 	#
 	# Get third party libraries.