beast r4472 - in trunk: . data library/samples

[timj svn gnome org]

Author: timj
Date: Wed Jun  4 21:55:50 2008
New Revision: 4472
URL: http://svn.gnome.org/viewvc/beast?rev=4472&view=rev

Log:
Added versioned sample dir to search path.

2008-06-04 23:52:21  Tim Janik  <timj gtk org>

        * configure.in: renamed bse*sample*dir variables to be less ambiguous.

        * data/Makefile.am: added versioned sample dir to search path.

        * library/samples/Makefile.am: renamred variables accordingly.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/Makefile.am
   trunk/library/samples/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jun  4 21:55:50 2008
@@ -337,15 +337,15 @@
     AC_SUBST(bsedriverdir)
     bseladspapath=${libdir}/ladspa
     AC_SUBST(bseladspapath)
-    bsesampledir=\${datadir}/bse/samples
-    AC_SUBST(bsesampledir)
+    bseunversionedsampledir=\${datadir}/bse/samples
+    AC_SUBST(bseunversionedsampledir)
     bsedatadir=\${datadir}/bse/v$BIN_VERSION
     bseeffectdir=$bsedatadir/effects
     AC_SUBST(bseeffectdir)
     bseinstrumentdir=$bsedatadir/instruments
     AC_SUBST(bseinstrumentdir)
-    bsesamplesdir=$bsedatadir/samples
-    AC_SUBST(bsesamplesdir)
+    bsesampledir=$bsedatadir/samples
+    AC_SUBST(bsesampledir)
     bsescriptdir=$bsedatadir/scripts
     AC_SUBST(bsescriptdir)
     bsedemodir=$bsedatadir/demo

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Wed Jun  4 21:55:50 2008
@@ -99,7 +99,7 @@
 	&& echo "#define BSE_PATH_PLUGINS         \"${bseplugindir}\"" >> xgen-cph \
 	&& echo "#define BSE_PATH_DRIVERS         \"${bsedriverdir}\"" >> xgen-cph \
 	&& echo "#define BSE_PATH_DEMOS           \"${bsedemodir}\"" >> xgen-cph \
-	&& echo "#define BSE_PATH_SAMPLES         \"${bsesampledir}\"" >> xgen-cph \
+	&& echo "#define BSE_PATH_SAMPLES         \"${bsesampledir}:${bseunversionedsampledir}\"" >> xgen-cph \
 	&& echo "#define BSE_PATH_EFFECTS         \"${bseeffectdir}\"" >> xgen-cph \
 	&& echo "#define BSE_PATH_INSTRUMENTS     \"${bseinstrumentdir}\"" >> xgen-cph \
 	&& echo "#define BSE_PATH_SCRIPTS         \"${bsescriptdir}\"" >> xgen-cph \

Modified: trunk/library/samples/Makefile.am
==============================================================================
--- trunk/library/samples/Makefile.am	(original)
+++ trunk/library/samples/Makefile.am	Wed Jun  4 21:55:50 2008
@@ -5,9 +5,9 @@
 include $(top_srcdir)/Makefile.decl
 
 
-samples_DATA = $(strip			\
+sample_DATA = $(strip			\
 	retrokit.bsewave		\
 )
-samplesdir = $(bsesamplesdir)
+sampledir = $(bsesampledir)
 
-EXTRA_DIST += $(samples_DATA)
+EXTRA_DIST += $(sample_DATA)