49 lines
1.8 KiB
Text
49 lines
1.8 KiB
Text
--- ./wscript.orig 2013-08-14 18:32:02.000000000 +0000
|
|
+++ ./wscript 2013-09-17 19:23:37.000000000 +0000
|
|
@@ -29,7 +29,6 @@
|
|
|
|
APPNAME = 'midori'
|
|
VERSION = VERSION_FULL = '0.5.5'
|
|
-VERSION_SUFFIX = ' (%s)' % VERSION
|
|
|
|
try:
|
|
if os.path.isdir ('.git'):
|
|
@@ -44,8 +43,10 @@
|
|
folder = os.getcwd ()
|
|
if VERSION in folder:
|
|
VERSION_FULL = os.path.basename (folder)
|
|
- if VERSION in VERSION_FULL:
|
|
- VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '')
|
|
+ if APPNAME in VERSION_FULL:
|
|
+ VERSION_FULL = VERSION_FULL.replace (APPNAME, '')[1:]
|
|
+
|
|
+ VERSION_SUFFIX = ' (%s)' % VERSION_FULL
|
|
except:
|
|
pass
|
|
|
|
@@ -530,15 +531,16 @@
|
|
|
|
for config_file in os.listdir ('config'):
|
|
dest = '${SYSCONFDIR}/xdg/' + APPNAME
|
|
- if (os.path.isdir ('config/' + config_file)):
|
|
- dest += '/' + config_file
|
|
- for child in os.listdir ('config/' + config_file):
|
|
- if (os.path.isdir ('config/' + config_file + '/' + child)):
|
|
- dest += '/' + child
|
|
- child += '/*'
|
|
- bld.install_files (dest, 'config/' + config_file + '/' + child)
|
|
- continue
|
|
- bld.install_files (dest, 'config/' + config_file)
|
|
+ if not config_file.endswith('.orig'):
|
|
+ if (os.path.isdir ('config/' + config_file)):
|
|
+ dest += '/' + config_file
|
|
+ for child in os.listdir ('config/' + config_file):
|
|
+ if (os.path.isdir ('config/' + config_file + '/' + child)):
|
|
+ dest += '/' + child
|
|
+ child += '/*'
|
|
+ bld.install_files (dest, 'config/' + config_file + '/' + child)
|
|
+ continue
|
|
+ bld.install_files (dest, 'config/' + config_file)
|
|
|
|
if Options.commands['check'] or bld.env['tests']:
|
|
bld.add_subdirs ('tests')
|