--- picard-0.7.2/setup.py	2006-11-18 20:15:00.000000000 +0100
+++ picard-0.7.2/setup.py	2006-11-18 20:19:11.000000000 +0100
@@ -35,11 +35,17 @@
     def initialize_options(self):
         build.initialize_options(self)
         self.build_locales = None
+        self.localedir = None
     
     def finalize_options(self):
         build.finalize_options(self)
         if self.build_locales is None:
             self.build_locales = os.path.join(self.build_base, 'locale')
+        self.localedir = self.build_locales
+        
+    def run(self):
+        generate_file('scripts/picard.in', 'scripts/picard', {'localedir': self.localedir})
+        build.run(self)
 
 class build_locales(Command):
     
@@ -141,7 +147,6 @@
     def initialize_options(self):
         install.initialize_options(self)
         self.install_locales = None
-        self.localedir = None
     
     def finalize_options(self):
         install.finalize_options(self)
@@ -149,14 +154,9 @@
             self.install_locales = '$base/share/locale'
             self._expand_attrs(['install_locales'])
         self.install_locales = os.path.normpath(self.install_locales)
-        self.localedir = self.install_locales
         if self.root is not None:
             self.change_roots('locales')
         
-    def run(self):
-        generate_file('scripts/picard.in', 'scripts/picard', {'localedir': self.localedir})
-        install.run(self)
-        
 args['cmdclass'] = {
     'build': my_build,
     'build_locales': build_locales,