* configure.ac, Makefile.am, libvisual-0.3.pc.in, libvisual/Makefile.am:
  Don't hardcode version suffixes in installation paths and filenames.

Author: descender

libvisual/Makefile.am

@@ -1,29 +1,28 @@
 ## Process this file with automake to generate a Makefile.in
 
-SUBDIRS = m4  libvisual po
+SUBDIRS = m4 libvisual po
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libvisual-0.3.pc
+pkgconfig_DATA = libvisual-$(LIBVISUAL_VERSION_SUFFIX).pc
 
 install-exec-local: libvisual/lvconfig.h 
-	        $(mkinstalldirs) $(DESTDIR)$(includedir)/libvisual
-	        file=$(DESTDIR)$(includedir)/libvisual-0.3/libvisual/lvconfig.h; \
+	        file=$(DESTDIR)$(LIBVISUAL_INCLUDE_DIR)/libvisual/lvconfig.h; \
 	        if test -r $$file && cmp -s libvisual/lvconfig.h $$file; then :; \
 	        else $(INSTALL_DATA) libvisual/lvconfig.h $$file; fi
 
 lvconfig.h: stamp-gc-h
 	@if test -f libvisual/lvconfig.h; then :; \
 	else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
+
 stamp-gc-h: config.status
 	cd $(top_builddir) && $(SHELL) ./config.status libvisual/lvconfig.h
 	echo timestamp > stamp-gc-h
 
 uninstall-local:
-		rmdir $(includedir)/libvisual
+	rmdir $(includedir)/libvisual
 
 EXTRA_DIST = config.rpath mkinstalldirs  config.rpath mkinstalldirs  config.rpath mkinstalldirs  Doxyfile
 
 DISTCLEANFILES = libvisual/lvconfig.h
 
-
 ACLOCAL_AMFLAGS = -I m4

libvisual/configure.ac

@@ -1,9 +1,12 @@
 # Process this file with autoconf to produce a configure script.
-
 AC_PREREQ(2.57)
+
 AC_INIT([Libvisual Library], [0.3.0], [[email protected]], [libvisual])
 AM_INIT_AUTOMAKE([1.7.0 dist-bzip2])
 
+LIBVISUAL_VERSION_SUFFIX="0.3"
+AC_SUBST(LIBVISUAL_VERSION_SUFFIX)
+
 AC_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -346,7 +349,7 @@ elif test x"$LV_THREAD_CFLAGS" != x; then
 fi
 AC_SUBST(VISUAL_PKG_CONFIG_DEP)
 
-VISUAL_LIBS="$LIBS -lvisual-0.3"
+VISUAL_LIBS="$LIBS -lvisual${LIBVISUAL_VERSION_SUFFIX}"
 if test x"$LV_THREAD_LIBS" != x; then
   VISUAL_LIBS="$LV_THREAD_LIBS $VISUAL_LIBS"
 fi
@@ -467,9 +470,10 @@ AC_SUBST(CFLAGS, "${CFLAGS} ${DEBUG_CFLAGS} ${OPT_CFLAGS}")
 libs_dynamic_loader="-ldl"
 AC_SUBST(LIBS_DYNAMIC_LOADER, "$libs_dynamic_loader")
 
-AC_SUBST(BUILD_SUBDIRS, "libvisual")
-
-LIBVISUAL_PLUGINS_BASE_DIR="${libdir}/libvisual-0.3"
+dnl Installation paths
+LIBVISUAL_INCLUDE_DIR="${includedir}/libvisual-${LIBVISUAL_VERSION_SUFFIX}"
+LIBVISUAL_PLUGINS_BASE_DIR="${libdir}/libvisual-${LIBVISUAL_VERSION_SUFFIX}"
+AC_SUBST(LIBVISUAL_INCLUDE_DIR)
 AC_SUBST(LIBVISUAL_PLUGINS_BASE_DIR)
 
 dnl Output the LibVisual config file
@@ -812,15 +816,15 @@ libvisual/Makefile
 
 AC_OUTPUT
 
-plugins_base_dir=`eval echo \`eval echo $LIBVISUAL_PLUGINS_BASE_DIR\``
+plugins_base_dir=`eval echo \`eval echo ${LIBVISUAL_PLUGINS_BASE_DIR}\``
 
 echo "
 =====================================================================
 LIBVISUAL, AN AUDIO VISUALISATION ABSTRACTION LIBRARY, VERSION $VERSION
 =====================================================================
 
 install path                         : ${prefix}/lib
-plugins base dir                     : $plugins_base_dir
+plugins base directory               : $plugins_base_dir
 compiler                             : ${CC}
 debug enabled                        : ${debug}
 "

libvisual/libvisual-0.3.pc.in

@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/libvisual-0.3
+includedir=@LIBVISUAL_INCLUDE_DIR@
 pluginsbasedir=@LIBVISUAL_PLUGINS_BASE_DIR@
 
 Name: libvisual

libvisual/libvisual/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to generate a Makefile.in
 
-library_includedir = $(includedir)/libvisual-0.3/libvisual
+library_includedir = $(LIBVISUAL_INCLUDE_DIR)/libvisual
 library_include_HEADERS = lvconfig.h libvisual.h lv_actor.h \
 			  lv_audio.h lv_bin.h lv_common.h lv_fourier.h \
 			  lv_input.h lv_event.h lv_keysym.h \
@@ -15,7 +15,7 @@ library_include_HEADERS = lvconfig.h libvisual.h lv_actor.h \
 			  lv_hashlist.h lv_cache.h lv_collection.h \
 			  lv_utils.h lv_os.h lv_math.h lv_gl.h lv_defines.h
 
-lib_LTLIBRARIES = libvisual-0.3.la
+lib_LTLIBRARIES = libvisual-@LIBVISUAL_VERSION_SUFFIX@.la
 
 DEFS = @DEFS@
 
@@ -29,9 +29,9 @@ AM_CFLAGS = -DPLUGPATH="\"$(LIBVISUAL_PLUGINS_BASE_DIR)\"" \
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libvisual \
 	   -I$(top_builddir) -I$(top_builddir)/libvisual
 
-libvisual_0_3_la_LDFLAGS = -export-dynamic -no-undefined
+libvisual_@LIBVISUAL_VERSION_SUFFIX@_la_LDFLAGS = -export-dynamic -no-undefined
 
-libvisual_0_3_la_SOURCES = lv_actor.c lv_input.c lv_event.c \
+libvisual_@LIBVISUAL_VERSION_SUFFIX@_la_SOURCES = lv_actor.c lv_input.c lv_event.c \
 		       lv_bin.c lv_plugin.c lv_video.c lv_video_simd.c lv_mem.c \
 		       lv_audio.c lv_fourier.c lv_list.c lv_log.c lv_palette.c \
 		       lv_libvisual.c lv_songinfo.c lv_morph.c lv_bmp.c lv_param.c \