[Pmplib-commits] SF.net SVN: pmplib: [364] trunk/pmplib

[<suc...@us...>]

Revision: 364
          http://svn.sourceforge.net/pmplib/?rev=364&view=rev
Author:   sucknblow
Date:     2007-02-14 13:16:16 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
--enable-versioned-jspldir configure option for
installing JSPLs to $prefix/share/pmplib-x.yz/jspl

Modified Paths:
--------------
    trunk/pmplib/configure.in
    trunk/pmplib/frontend/easypmp/cui/Makefile.am
    trunk/pmplib/lib/playlist/Makefile.am

Modified: trunk/pmplib/configure.in
===================================================================
--- trunk/pmplib/configure.in	2007-02-14 16:47:53 UTC (rev 363)
+++ trunk/pmplib/configure.in	2007-02-14 21:16:16 UTC (rev 364)
@@ -240,6 +240,20 @@
 AC_SUBST(PLUGIN_DIR)
 
 dnl ------------------------------------------------------------------
+dnl Check whether to install JSPLs in share/pmplib/jspl or share/pmplib-x.yz/jspl
+dnl ------------------------------------------------------------------
+AC_ARG_ENABLE(
+  versioned-jspldir,
+  [AC_HELP_STRING(--enable-versioned-jspldir, [Include version number in JSPL path])]
+)
+if test "$enable_versioned_jspldir" = "yes" ; then
+  JSPL_DIR=$PACKAGE-$VERSION
+else
+  JSPL_DIR=$PACKAGE
+fi
+AC_SUBST(JSPL_DIR)
+
+dnl ------------------------------------------------------------------
 dnl Output the configure results.
 dnl ------------------------------------------------------------------
 AC_CONFIG_FILES(Makefile m4/Makefile include/Makefile include/pmplib/Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/pmp/Makefile lib/gmi/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/pmp_iriverplus3/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile pmplib.spec)

Modified: trunk/pmplib/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/Makefile.am	2007-02-14 16:47:53 UTC (rev 363)
+++ trunk/pmplib/frontend/easypmp/cui/Makefile.am	2007-02-14 21:16:16 UTC (rev 364)
@@ -30,7 +30,7 @@
 INCLUDES = @INCLUDES@
 AM_LDFLAGS = @LDFLAGS@
 
-easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/@PACKAGE@/jspl\""
+easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/$(JSPL_DIR)/jspl\""
 
 easypmp_LDADD = \
 	$(top_builddir)/lib/pmp/libpmp.la \

Modified: trunk/pmplib/lib/playlist/Makefile.am
===================================================================
--- trunk/pmplib/lib/playlist/Makefile.am	2007-02-14 16:47:53 UTC (rev 363)
+++ trunk/pmplib/lib/playlist/Makefile.am	2007-02-14 21:16:16 UTC (rev 364)
@@ -8,7 +8,7 @@
 	jspl/top_ranking.jspl
   jspl_c = jspl.c
 
-  jspldir = $(prefix)/share/@PACKAGE@/jspl
+  jspldir = $(prefix)/share/$(JSPL_DIR)/jspl
   jspl_DATA = $(jspl_files)
 endif
 


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