From ba9621d3a09078b3bff3d3c986c325ed6e8ae9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Mon, 1 Feb 2016 08:15:03 +0000 Subject: [PATCH] [DEVELOPMENT ENVIROMENT] * BUG: Packager: Fix library support. git-svn-id: svn://localhost/gambas/trunk@7595 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.src/Packager/Package.module | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/gambas3/.src/Packager/Package.module b/app/src/gambas3/.src/Packager/Package.module index 6277353f4..b331ab5bb 100644 --- a/app/src/gambas3/.src/Packager/Package.module +++ b/app/src/gambas3/.src/Packager/Package.module @@ -212,7 +212,7 @@ Private Sub InitMake(sSys As String) If $sName Not Begins $sVendorPrefix & "." Then $sComponentName = $sVendorPrefix & "." & $sName $sComponentName = String.LCase($sComponentName) Else If Project.Type = Project.TYPE_LIBRARY Then - $sLibraryName = $sName & ":" & Project.Major & "." & Project.Minor + $sLibraryName = $sName & ":" & Project.MajorVersion & "." & Project.MinorVersion Endif '$sPrefix = GetPackagePrefix(Project.Vendor, Project.Prefix) @@ -1425,10 +1425,11 @@ Private Function MakeRpmPackage(sSys As String) Print #hFile, "\n%install" - Print #hFile, "install -d %{buildroot}/%{_bindir}" If Project.Type = Project.TYPE_NORMAL Then + Print #hFile, "install -d %{buildroot}/%{_bindir}" Print #hFile, "install -p "; Shell$($sName); ".gambas %{buildroot}/%{_bindir}" &/ Shell$($sName) Else If Project.Type = Project.TYPE_LIBRARY Then + Print #hFile, "install -d %{buildroot}/%{_libdir}/gambas"; System.Version; "/"; LCase($sVendor) Print #hFile, "install -p "; Shell$($sName); ".gambas %{buildroot}/%{_libdir}/gambas"; System.Version; "/"; LCase($sVendor); "/"; Shell$($sLibraryName & ".gambas") Endif