On Mon, Feb 14, 2005, Ralf S. Engelschall wrote:
> On Mon, Feb 14, 2005, Matthias Kurz wrote:
>
> > This is my last version. I have to move on.
>
> Thanks for your efforts, Matthias. I've taken over your patch for
> OpenPKG-CURRENT. See http://cvs.openpkg.org/chngview?cn=22027 for
> details.
Hi.
Ok, the "rm -rf $prefix/share/locale/*" was a trick. There is still
this problem:
http://marc.theaimsgroup.com/?l=openpkg-dev&m=110815538031050&w=2
The attached updated patch fixes this for me.
(mk)
--
Matthias Kurz; Fuldastr. 3; D-28199 Bremen; VOICE +49 421 53 600 47
>> Im prämotorischen Cortex kann jeder ein Held sein. (bdw) <<
Index: setup.py
===================================================================
RCS file: /cvs/opkg/vendor_stuff/linkchecker/setup.py,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 setup.py
--- setup.py 7 Feb 2005 00:30:28 -0000 1.1.1.1
+++ setup.py 16 Feb 2005 13:19:24 -0000
@@ -86,7 +86,7 @@
else:
val = getattr(self, attr)
if attr == 'install_data':
- cdir = os.path.join(val, "share", "linkchecker")
+ cdir = os.path.join(val, "etc", "linkchecker")
data.append('config_dir = %r' % cnormpath(cdir))
data.append("%s = %r" % (attr, cnormpath(val)))
self.distribution.create_conf_file(data, directory=self.install_lib)
@@ -195,10 +195,10 @@
def build_extensions (self):
# For gcc 3.x we can add -std=gnu99 to get rid of warnings.
extra = []
- if self.compiler.compiler_type == 'unix':
- option = "-std=gnu99"
- if cc_supports_option(self.compiler.compiler, option):
- extra.append(option)
+ #if self.compiler.compiler_type == 'unix':
+ #option = "-std=gnu99"
+ #if cc_supports_option(self.compiler.compiler, option):
+ #extra.append(option)
# First, sanity-check the 'extensions' list
self.check_extensions_list(self.extensions)
for ext in self.extensions:
@@ -248,7 +248,7 @@
['share/locale/fr/LC_MESSAGES/linkchecker.mo']),
('share/locale/nl/LC_MESSAGES',
['share/locale/nl/LC_MESSAGES/linkchecker.mo']),
- ('share/linkchecker',
+ ('etc/linkchecker',
['config/linkcheckerrc', 'config/logging.conf', ]),
('share/linkchecker/examples',
['cgi/lconline/leer.html.en', 'cgi/lconline/leer.html.de',
@@ -258,13 +258,12 @@
]
if os.name == 'posix':
- data_files.append(('share/man/man1', ['doc/en/linkchecker.1']))
- data_files.append(('share/man/de/man1', ['doc/de/linkchecker.1']))
- data_files.append(('share/man/fr/man1', ['doc/fr/linkchecker.1']))
+ data_files.append(('man/man1', ['doc/en/linkchecker.1']))
+ data_files.append(('man/de/man1', ['doc/de/linkchecker.1']))
+ data_files.append(('man/fr/man1', ['doc/fr/linkchecker.1']))
data_files.append(('share/linkchecker/examples',
['config/linkchecker-completion', 'config/linkcheck-cron.sh']))
-elif os.name == 'nt':
- data_files.append(('share/linkchecker/doc',
+ data_files.append(('share/linkchecker/html',
['doc/documentation.html', 'doc/index.html',
'doc/install.html', 'doc/index.html', 'doc/other.html',
'doc/upgrading.html', 'doc/lc.css', 'doc/navigation.css',
Index: linkcheck/i18n.py
===================================================================
RCS file: /cvs/opkg/vendor_stuff/linkchecker/linkcheck/i18n.py,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 i18n.py
--- linkcheck/i18n.py 24 Jan 2005 20:52:50 -0000 1.1.1.1
+++ linkcheck/i18n.py 16 Feb 2005 13:19:24 -0000
@@ -73,12 +73,13 @@
"""
global default_language
# get supported languages
- for lang in os.listdir(directory):
- path = os.path.join(directory, lang)
- if not os.path.isdir(path):
- continue
- if os.path.exists(os.path.join(path, 'LC_MESSAGES', '%s.mo'%domain)):
- supported_languages.append(lang)
+ if os.path.isdir(directory):
+ for lang in os.listdir(directory):
+ path = os.path.join(directory, lang)
+ if not os.path.isdir(path):
+ continue
+ if os.path.exists(os.path.join(path,'LC_MESSAGES','%s.mo'%domain)):
+ supported_languages.append(lang)
loc = get_locale()
if loc in supported_languages:
default_language = loc
