wscript: Use INTERNAL_NAME instead of setting I18N_PACKAGE = 'ardour'…

… and appending MAJOR
Ardour · Oct 23, 2024 · df52978 · df52978
1 parent ca7abae
commit df52978
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/libs/auscan/wscript b/libs/auscan/wscript
@@ -1,9 +1,6 @@
 #!/usr/bin/env python
 import os
 
-# needed for code used from libardour
-I18N_PACKAGE = 'ardour'
-
 def options(opt):
     pass
 
@@ -19,7 +16,7 @@ def build(bld):
         obj.defines   = [
             'AU_SCANNER_APP',
             'VERSIONSTRING="' + bld.env['VERSION'] + '"',
-            'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"',
+            'PACKAGE="' + bld.env['INTERNAL_NAME'] + '"',
             'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"',
             'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
             ]

diff --git a/libs/fst/wscript b/libs/fst/wscript
@@ -3,9 +3,6 @@ import os
 import sys
 import re
 
-# needed for code used from libardour
-I18N_PACKAGE = 'ardour'
-
 def options(opt):
     pass
 
@@ -22,7 +19,7 @@ def build(bld):
         obj.defines   = [
             'VST3_SCANNER_APP',
             'VERSIONSTRING="' + bld.env['VERSION'] + '"',
-            'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"',
+            'PACKAGE="' + bld.env['INTERNAL_NAME'] + '"',
             'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"',
             'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
             ]
@@ -64,7 +61,7 @@ def build(bld):
             '_POSIX_SOURCE',
             'USE_WS_PREFIX',
             'VST_SCANNER_APP',
-            'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"',
+            'PACKAGE="' + bld.env['INTERNAL_NAME'] + '"',
             'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"',
             'VERSIONSTRING="' + bld.env['VERSION'] + '"',
             ]