[geany/geany] 82842b: Install header files and geany.pc also on Windows
Enrico Tröger
git-noreply at xxxxx
Thu Apr 10 22:06:29 UTC 2014
Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger at uvena.de>
Committer: Enrico Tröger <enrico.troeger at uvena.de>
Date: Thu, 10 Apr 2014 22:06:29 UTC
Commit: 82842b230b06e87b15069ccc0384d06cdee22d2e
https://github.com/geany/geany/commit/82842b230b06e87b15069ccc0384d06cdee22d2e
Log Message:
-----------
Install header files and geany.pc also on Windows
Modified Paths:
--------------
wscript
Modified: wscript
35 files changed, 17 insertions(+), 18 deletions(-)
===================================================================
@@ -238,7 +238,7 @@ def configure(conf):
_add_to_env_and_define(conf, 'PREFIX', new_prefix, quote=True)
_add_to_env_and_define(conf, 'BINDIR', os.path.join(new_prefix, 'bin'), quote=True)
_add_to_env_and_define(conf, 'DOCDIR', os.path.join(conf.env['PREFIX'], 'doc'), quote=True)
- _add_to_env_and_define(conf, 'LIBDIR', conf.env['PREFIX'], quote=True)
+ _add_to_env_and_define(conf, 'LIBDIR', '%s/lib' % conf.env['PREFIX'], quote=True)
conf.define('LOCALEDIR', os.path.join('share' 'locale'), quote=True)
# overwrite LOCALEDIR to install message catalogues properly
conf.env['LOCALEDIR'] = os.path.join(conf.env['PREFIX'], 'share/locale')
@@ -501,23 +501,22 @@ def build(bld):
###
# Install files
###
- if not is_win32:
- # Headers
- bld.install_files('${PREFIX}/include/geany', '''
- src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h
- src/highlighting.h src/keybindings.h src/msgwindow.h src/plugindata.h
- src/prefs.h src/project.h src/search.h src/stash.h src/support.h
- src/templates.h src/toolbar.h src/ui_utils.h src/utils.h src/build.h src/gtkcompat.h
- plugins/geanyplugin.h plugins/geanyfunctions.h''')
- bld.install_files('${PREFIX}/include/geany/scintilla', '''
- scintilla/include/SciLexer.h scintilla/include/Scintilla.h
- scintilla/include/Scintilla.iface scintilla/include/ScintillaWidget.h ''')
- bld.install_files('${PREFIX}/include/geany/tagmanager', '''
- tagmanager/src/tm_file_entry.h tagmanager/src/tm_project.h
- tagmanager/src/tm_source_file.h tagmanager/src/tm_parser.h
- tagmanager/src/tm_symbol.h tagmanager/src/tm_tag.h
- tagmanager/src/tm_tagmanager.h tagmanager/src/tm_work_object.h
- tagmanager/src/tm_workspace.h ''')
+ # Headers
+ bld.install_files('${PREFIX}/include/geany', '''
+ src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h
+ src/highlighting.h src/keybindings.h src/msgwindow.h src/plugindata.h
+ src/prefs.h src/project.h src/search.h src/stash.h src/support.h
+ src/templates.h src/toolbar.h src/ui_utils.h src/utils.h src/build.h src/gtkcompat.h
+ plugins/geanyplugin.h plugins/geanyfunctions.h''')
+ bld.install_files('${PREFIX}/include/geany/scintilla', '''
+ scintilla/include/SciLexer.h scintilla/include/Scintilla.h
+ scintilla/include/Scintilla.iface scintilla/include/ScintillaWidget.h ''')
+ bld.install_files('${PREFIX}/include/geany/tagmanager', '''
+ tagmanager/src/tm_file_entry.h tagmanager/src/tm_project.h
+ tagmanager/src/tm_source_file.h tagmanager/src/tm_parser.h
+ tagmanager/src/tm_symbol.h tagmanager/src/tm_tag.h
+ tagmanager/src/tm_tagmanager.h tagmanager/src/tm_work_object.h
+ tagmanager/src/tm_workspace.h ''')
# Docs
base_dir = '${PREFIX}' if is_win32 else '${DOCDIR}'
ext = '.txt' if is_win32 else ''
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list