Fix i18n.

git-svn-id: svn://localhost/ardour2/branches/3.0@10461 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 1aabd02f1af8fd8c54163697f9bed56ef978b9cb..9f9fb675b460315194e1afbf5c46f8e2c2f838c6 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -624,12 +624,13 @@ def build(bld):
 
     # i18n
     if bld.is_defined('ENABLE_NLS'):
-        mo_files = bld.path.ant_glob ('po/*.mo')
+        mo_files = bld.path.ant_glob('po/*.mo')
         for mo in mo_files:
-            lang = os.path.basename (mo).replace ('.mo', '')
-            bld.install_as (os.path.join(bld.env['PREFIX'], 'share', 'locale',
-                                         lang, 'LC_MESSAGES', APPNAME + '.mo'),
-                            mo)
+            lang = os.path.basename(mo.srcpath()).replace('.mo', '')
+            bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
+                                        lang, 'LC_MESSAGES', APPNAME + '.mo'),
+                           mo)
 
 def i18n(bld):
-    autowaf.build_i18n(bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources)
+    autowaf.build_i18n(bld, top, 'gtk2_ardour', APPNAME, gtk2_ardour_sources,
+                       'Paul Davis')

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index d7e88640133d76ad7595f25ab8a118d0d6b14620..6fd07ee50bb3dd291c78b150fc0c414901fee6ab 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -407,7 +407,7 @@ def build(bld):
     if bld.is_defined('ENABLE_NLS'):
         mo_files = bld.path.ant_glob('po/*.mo')
         for mo in mo_files:
-            lang = os.path.basename(mo).replace('.mo', '')
+            lang = os.path.basename(mo.srcpath()).replace('.mo', '')
             bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
                                         lang, 'LC_MESSAGES', 'libardour3.mo'),
                            mo)
@@ -452,4 +452,5 @@ def shutdown():
     autowaf.shutdown()
 
 def i18n(bld):
-    autowaf.build_i18n (bld, '.', 'libs/ardour', APPNAME, libardour_sources)
+    autowaf.build_i18n(bld, top, 'libs/ardour', APPNAME, libardour_sources,
+                       'Paul Davis')

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index a07b33e8fece649558a8919462d63af04acbc4e3..e62205a2d56d366b315be91ec485745ea78be56d 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -98,15 +98,16 @@ def build(bld):
 
     # i18n
     if bld.is_defined('ENABLE_NLS'):
-        mo_files = bld.path.ant_glob ('po/*.mo')
+        mo_files = bld.path.ant_glob('po/*.mo')
         for mo in mo_files:
-            lang = os.path.basename (mo).replace ('.mo', '')
-            bld.install_as (os.path.join(bld.env['PREFIX'], 'share', 'locale',
-                                         lang, 'LC_MESSAGES', 'libgtkmm2ext.mo'),
-                            mo)
+            lang = os.path.basename(mo.srcpath()).replace('.mo', '')
+            bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
+                                        lang, 'LC_MESSAGES', 'libgtkmm2ext.mo'),
+                           mo)
 
 def i18n(bld):
-    autowaf.build_i18n(bld, '.', 'libs/gtkmm2ext', APPNAME, gtkmm2ext_sources)
+    autowaf.build_i18n(bld, top, 'libs/gtkmm2ext', APPNAME, gtkmm2ext_sources,
+                       'Paul Davis')
 
 def shutdown():
     autowaf.shutdown()

diff --git a/waf b/waf
index 5185bc101476ffd96ba03974eb183abaa7d09f26..ce7892affe6597a7d66bfde45b50a453c6ea7c61 100755 (executable)
Binary files a/waf and b/waf differ