SF.net SVN: geany-plugins:[1398] trunk/geany-plugins/wscript

[eht16 at users.sourceforge.net]

Revision: 1398
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1398&view=rev
Author:   eht16
Date:     2010-05-23 19:09:43 +0000 (Sun, 23 May 2010)

Log Message:
-----------
Fix datadir handling on Windows (oops)

Modified Paths:
--------------
    trunk/geany-plugins/wscript

Modified: trunk/geany-plugins/wscript
===================================================================
--- trunk/geany-plugins/wscript	2010-05-23 19:06:36 UTC (rev 1397)
+++ trunk/geany-plugins/wscript	2010-05-23 19:09:43 UTC (rev 1398)
@@ -394,6 +394,7 @@
 
 def build(bld):
 	is_win32 = target_is_win32(bld.env)
+	datadir = '${G_PREFIX}/${GEANYPLUGINS_DATADIR}' if is_win32 else '${GEANYPLUGINS_DATADIR}'
 
 	def build_lua(bld, p, libs):
 		lua_sources = [ 'geanylua/glspi_init.c', 'geanylua/glspi_app.c', 'geanylua/glspi_dlg.c',
@@ -414,7 +415,6 @@
 		docdir = '${G_PREFIX}/doc/plugins/geanylua' if is_win32 else '${DOCDIR}/geanylua'
 		bld.install_files(docdir, 'geanylua/docs/*.html')
 		# install examples (Waf doesn't support installing files recursively, yet)
-		datadir = '${GEANYPLUGINS_DATADIR}'
 		bld.install_files('%s/geany-plugins/geanylua/dialogs' % datadir, 'geanylua/examples/dialogs/*.lua')
 		bld.install_files('%s/geany-plugins/geanylua/edit' % datadir, 'geanylua/examples/edit/*.lua')
 		bld.install_files('%s/geany-plugins/geanylua/info' % datadir, 'geanylua/examples/info/*.lua')
@@ -430,7 +430,6 @@
 			bld.install_files(docdir, 'geanygendoc/docs/help/manual.html')
 		bld.install_files(docdir, 'geanygendoc/docs/help/manual.rst')
 		# install examples (Waf doesn't support installing files recursively, yet)
-		datadir = '${GEANYPLUGINS_DATADIR}'
 		bld.install_files('%s/geany-plugins/geanygendoc/filetypes' % datadir, \
 			'geanygendoc/data/filetypes/*.conf')
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.