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

[eht16 at users.sourceforge.net]

Revision: 759
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=759&view=rev
Author:   eht16
Date:     2009-06-20 17:48:34 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
Lua improvements on Windows. It does build.

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

Modified: trunk/geany-plugins/wscript
===================================================================
--- trunk/geany-plugins/wscript	2009-06-20 17:27:58 UTC (rev 758)
+++ trunk/geany-plugins/wscript	2009-06-20 17:48:34 UTC (rev 759)
@@ -354,19 +354,21 @@
 						'geanylua/glspi_doc.c', 'geanylua/glspi_kfile.c', 'geanylua/glspi_run.c',
 						'geanylua/glspi_sci.c', 'geanylua/gsdlg_lua.c' ]
 
-		# FIXME this most probably won't work on Windows, untested
 		bld.new_task_gen(
 			features		= 'cc cshlib',
 			source			= lua_sources,
 			includes		= p.includes,
 			target			= 'libgeanylua',
 			uselib			= libs,
-			install_path	= '${DATADIR}/geany/plugins/geanylua'
+			# FIXME wrong path on non-Win32, should be in $libdir
+			install_path	= '${G_PREFIX}/lib' if is_win32 else '${DATADIR}/geany/plugins/geanylua'
 		)
 
 		# install docs
-		bld.install_files('${DATADIR}/doc/geany-plugins/geanylua', 'geanylua/docs/*.html')
+		docdir = '${G_PREFIX}/doc/geanylua' if is_win32 else '${DOCDIR}/geanylua'
+		bld.install_files(docdir, 'geanylua/docs/*.html')
 		# install examples (Waf doesn't support installing files recursively, yet)
+		# FIXME we need a better path
 		bld.install_files('${DATADIR}/geany/plugins/geanylua/examples/dialogs', 'geanylua/examples/dialogs/*.lua')
 		bld.install_files('${DATADIR}/geany/plugins/geanylua/examples/edit', 'geanylua/examples/edit/*.lua')
 		bld.install_files('${DATADIR}/geany/plugins/geanylua/examples/info', 'geanylua/examples/info/*.lua')


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