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

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

Revision: 361
          http://svn.sourceforge.net/pmplib/?rev=361&view=rev
Author:   sucknblow
Date:     2007-02-13 15:31:21 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Install modules to /usr/lib/pmplib-x.yz on Debian

Modified Paths:
--------------
    trunk/pmplib/configure.in
    trunk/pmplib/debian/libpmp0.install
    trunk/pmplib/debian/rules
    trunk/pmplib/lib/pmp/Makefile.am
    trunk/pmplib/lib/pmp_iriverplus2/Makefile.am
    trunk/pmplib/lib/pmp_iriverplus3/Makefile.am
    trunk/pmplib/lib/pmp_irivnavi/Makefile.am
    trunk/pmplib/lib/pmp_portalplayer1/Makefile.am

Modified: trunk/pmplib/configure.in
===================================================================
--- trunk/pmplib/configure.in	2007-02-13 21:25:28 UTC (rev 360)
+++ trunk/pmplib/configure.in	2007-02-13 23:31:21 UTC (rev 361)
@@ -226,6 +226,20 @@
 AM_CONDITIONAL(have_getopt, test "$ac_cv_header_getopt_h" = "yes")
 
 dnl ------------------------------------------------------------------
+dnl Check whether to install plugins in lib/pmplib or lib/pmplib-x.yz
+dnl ------------------------------------------------------------------
+AC_ARG_ENABLE(
+  versioned-libdir,
+  [AC_HELP_STRING(--enable-versioned-libdir, [Include version number in plugins path])]
+)
+if test "$enable_versioned_libdir" = "yes" ; then
+  PLUGIN_DIR=$PACKAGE-$VERSION
+else
+  PLUGIN_DIR=$PACKAGE
+fi
+AC_SUBST(PLUGIN_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/debian/libpmp0.install
===================================================================
--- trunk/pmplib/debian/libpmp0.install	2007-02-13 21:25:28 UTC (rev 360)
+++ trunk/pmplib/debian/libpmp0.install	2007-02-13 23:31:21 UTC (rev 361)
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/libpmp*.so.*
-debian/tmp/usr/lib/pmplib/*.so
-debian/tmp/usr/lib/pmplib/*.la
+debian/tmp/usr/lib/pmplib*/*.so
+debian/tmp/usr/lib/pmplib*/*.la
 debian/tmp/usr/share/pmplib/*

Modified: trunk/pmplib/debian/rules
===================================================================
--- trunk/pmplib/debian/rules	2007-02-13 21:25:28 UTC (rev 360)
+++ trunk/pmplib/debian/rules	2007-02-13 23:31:21 UTC (rev 361)
@@ -22,6 +22,7 @@
 	dh_testdir
 	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
 	  ./configure \
+	  --enable-versioned-libdir \
 	  --host=$(DEB_HOST_GNU_TYPE) \
 	  --build=$(DEB_BUILD_GNU_TYPE) \
 	  --prefix=/usr \

Modified: trunk/pmplib/lib/pmp/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp/Makefile.am	2007-02-13 21:25:28 UTC (rev 360)
+++ trunk/pmplib/lib/pmp/Makefile.am	2007-02-13 23:31:21 UTC (rev 361)
@@ -8,7 +8,7 @@
 	pmp.c \
 	pmp_posix.c
 
-libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/@PACKAGE@\"" $(LTDLINCL)
+libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/$(PLUGIN_DIR)\"" $(LTDLINCL)
 
 libpmp_la_LDFLAGS = \
 	-no-undefined

Modified: trunk/pmplib/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/Makefile.am	2007-02-13 21:25:28 UTC (rev 360)
+++ trunk/pmplib/lib/pmp_iriverplus2/Makefile.am	2007-02-13 23:31:21 UTC (rev 361)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/@PACKAGE@
+pmpdir=$(libdir)/$(PLUGIN_DIR)
 pmp_LTLIBRARIES = iriverplus2.la
 
 iriverplus2_la_SOURCES = \

Modified: trunk/pmplib/lib/pmp_iriverplus3/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/Makefile.am	2007-02-13 21:25:28 UTC (rev 360)
+++ trunk/pmplib/lib/pmp_iriverplus3/Makefile.am	2007-02-13 23:31:21 UTC (rev 361)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/@PACKAGE@
+pmpdir=$(libdir)/$(PLUGIN_DIR)
 pmp_LTLIBRARIES = iriverplus3.la
 
 iriverplus3_la_SOURCES = \

Modified: trunk/pmplib/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/Makefile.am	2007-02-13 21:25:28 UTC (rev 360)
+++ trunk/pmplib/lib/pmp_irivnavi/Makefile.am	2007-02-13 23:31:21 UTC (rev 361)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/@PACKAGE@
+pmpdir=$(libdir)/$(PLUGIN_DIR)
 pmp_LTLIBRARIES = irivnavi.la
 
 irivnavi_la_SOURCES = \

Modified: trunk/pmplib/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/Makefile.am	2007-02-13 21:25:28 UTC (rev 360)
+++ trunk/pmplib/lib/pmp_portalplayer1/Makefile.am	2007-02-13 23:31:21 UTC (rev 361)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/@PACKAGE@
+pmpdir=$(libdir)/$(PLUGIN_DIR)
 pmp_LTLIBRARIES = portalplayer1.la
 
 portalplayer1_la_SOURCES = \


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