[G15daemon-commits] SF.net SVN: g15daemon: [286] trunk/g15daemon-wip

[<mla...@us...>]

Revision: 286
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=286&view=rev
Author:   mlampard
Date:     2007-09-07 22:36:08 -0700 (Fri, 07 Sep 2007)

Log Message:
-----------
install plugins to libdir/g15daemon/version/plugins

Modified Paths:
--------------
    trunk/g15daemon-wip/configure.in
    trunk/g15daemon-wip/g15daemon/main.c
    trunk/g15daemon-wip/plugins/Makefile.am

Modified: trunk/g15daemon-wip/configure.in
===================================================================
--- trunk/g15daemon-wip/configure.in	2007-09-05 09:36:53 UTC (rev 285)
+++ trunk/g15daemon-wip/configure.in	2007-09-08 05:36:08 UTC (rev 286)
@@ -46,6 +46,9 @@
 CPPFLAGS=$CPPFLAGS_save
 CPPFLAGS="$CPPFLAGS "'-DDATADIR="\"$(datadir)\""'
 
+AC_SUBST(G15DAEMON_PLUGIN_DIR,["$libdir/g15daemon/$PACKAGE_VERSION/plugins"])
+CPPFLAGS="$CPPFLAGS "'-DPLUGINDIR=\"$(G15DAEMON_PLUGIN_DIR)\"'
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_PID_T

Modified: trunk/g15daemon-wip/g15daemon/main.c
===================================================================
--- trunk/g15daemon-wip/g15daemon/main.c	2007-09-05 09:36:53 UTC (rev 285)
+++ trunk/g15daemon-wip/g15daemon/main.c	2007-09-08 05:36:08 UTC (rev 286)
@@ -437,7 +437,7 @@
 	free (canvas);
         uf_write_buf_to_g15(lcdlist->tail->lcd);
 	
-        snprintf((char*)location,1024,"%s/%s",DATADIR,"g15daemon/plugins");
+        snprintf((char*)location,1024,"%s",PLUGINDIR);
 
         g15_open_all_plugins(lcdlist,(char*)location);
 

Modified: trunk/g15daemon-wip/plugins/Makefile.am
===================================================================
--- trunk/g15daemon-wip/plugins/Makefile.am	2007-09-05 09:36:53 UTC (rev 285)
+++ trunk/g15daemon-wip/plugins/Makefile.am	2007-09-08 05:36:08 UTC (rev 286)
@@ -1,6 +1,6 @@
 
 METASOURCES = AUTO
-libdir = /usr/share/g15daemon/plugins
+libdir = @G15DAEMON_PLUGIN_DIR@
 AM_CFLAGS = -Wall
 
 lib_LTLIBRARIES =g15plugin_uinput.la g15plugin_tcpserver.la g15plugin_clock.la


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