Skip to content

Commit 2567c7a

Browse files
author
descender
committed
* configure.ac, Makefile.am, libvisual-0.3.pc.in, libvisual/Makefile.am: Don't hardcode version suffixes in installation paths and filenames.
1 parent 49a26fd commit 2567c7a

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

libvisual/Makefile.am

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
## Process this file with automake to generate a Makefile.in
22

3-
SUBDIRS = m4 libvisual po
3+
SUBDIRS = m4 libvisual po
44

55
pkgconfigdir = $(libdir)/pkgconfig
6-
pkgconfig_DATA = libvisual-0.3.pc
6+
pkgconfig_DATA = libvisual-$(LIBVISUAL_VERSION_SUFFIX).pc
77

88
install-exec-local: libvisual/lvconfig.h
9-
$(mkinstalldirs) $(DESTDIR)$(includedir)/libvisual
10-
file=$(DESTDIR)$(includedir)/libvisual-0.3/libvisual/lvconfig.h; \
9+
file=$(DESTDIR)$(LIBVISUAL_INCLUDE_DIR)/libvisual/lvconfig.h; \
1110
if test -r $$file && cmp -s libvisual/lvconfig.h $$file; then :; \
1211
else $(INSTALL_DATA) libvisual/lvconfig.h $$file; fi
1312

1413
lvconfig.h: stamp-gc-h
1514
@if test -f libvisual/lvconfig.h; then :; \
1615
else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
16+
1717
stamp-gc-h: config.status
1818
cd $(top_builddir) && $(SHELL) ./config.status libvisual/lvconfig.h
1919
echo timestamp > stamp-gc-h
2020

2121
uninstall-local:
22-
rmdir $(includedir)/libvisual
22+
rmdir $(includedir)/libvisual
2323

2424
EXTRA_DIST = config.rpath mkinstalldirs config.rpath mkinstalldirs config.rpath mkinstalldirs Doxyfile
2525

2626
DISTCLEANFILES = libvisual/lvconfig.h
2727

28-
2928
ACLOCAL_AMFLAGS = -I m4

libvisual/configure.ac

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# Process this file with autoconf to produce a configure script.
2-
32
AC_PREREQ(2.57)
3+
44
AC_INIT([Libvisual Library], [0.3.0], [[email protected]], [libvisual])
55
AM_INIT_AUTOMAKE([1.7.0 dist-bzip2])
66

7+
LIBVISUAL_VERSION_SUFFIX="0.3"
8+
AC_SUBST(LIBVISUAL_VERSION_SUFFIX)
9+
710
AC_CONFIG_HEADER(config.h)
811

912
AC_CANONICAL_HOST
@@ -346,7 +349,7 @@ elif test x"$LV_THREAD_CFLAGS" != x; then
346349
fi
347350
AC_SUBST(VISUAL_PKG_CONFIG_DEP)
348351

349-
VISUAL_LIBS="$LIBS -lvisual-0.3"
352+
VISUAL_LIBS="$LIBS -lvisual${LIBVISUAL_VERSION_SUFFIX}"
350353
if test x"$LV_THREAD_LIBS" != x; then
351354
VISUAL_LIBS="$LV_THREAD_LIBS $VISUAL_LIBS"
352355
fi
@@ -467,9 +470,10 @@ AC_SUBST(CFLAGS, "${CFLAGS} ${DEBUG_CFLAGS} ${OPT_CFLAGS}")
467470
libs_dynamic_loader="-ldl"
468471
AC_SUBST(LIBS_DYNAMIC_LOADER, "$libs_dynamic_loader")
469472

470-
AC_SUBST(BUILD_SUBDIRS, "libvisual")
471-
472-
LIBVISUAL_PLUGINS_BASE_DIR="${libdir}/libvisual-0.3"
473+
dnl Installation paths
474+
LIBVISUAL_INCLUDE_DIR="${includedir}/libvisual-${LIBVISUAL_VERSION_SUFFIX}"
475+
LIBVISUAL_PLUGINS_BASE_DIR="${libdir}/libvisual-${LIBVISUAL_VERSION_SUFFIX}"
476+
AC_SUBST(LIBVISUAL_INCLUDE_DIR)
473477
AC_SUBST(LIBVISUAL_PLUGINS_BASE_DIR)
474478

475479
dnl Output the LibVisual config file
@@ -812,15 +816,15 @@ libvisual/Makefile
812816

813817
AC_OUTPUT
814818

815-
plugins_base_dir=`eval echo \`eval echo $LIBVISUAL_PLUGINS_BASE_DIR\``
819+
plugins_base_dir=`eval echo \`eval echo ${LIBVISUAL_PLUGINS_BASE_DIR}\``
816820

817821
echo "
818822
=====================================================================
819823
LIBVISUAL, AN AUDIO VISUALISATION ABSTRACTION LIBRARY, VERSION $VERSION
820824
=====================================================================
821825

822826
install path : ${prefix}/lib
823-
plugins base dir : $plugins_base_dir
827+
plugins base directory : $plugins_base_dir
824828
compiler : ${CC}
825829
debug enabled : ${debug}
826830
"

libvisual/libvisual-0.3.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
prefix=@prefix@
22
exec_prefix=@exec_prefix@
33
libdir=@libdir@
4-
includedir=@includedir@/libvisual-0.3
4+
includedir=@LIBVISUAL_INCLUDE_DIR@
55
pluginsbasedir=@LIBVISUAL_PLUGINS_BASE_DIR@
66

77
Name: libvisual

libvisual/libvisual/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Process this file with automake to generate a Makefile.in
22

3-
library_includedir = $(includedir)/libvisual-0.3/libvisual
3+
library_includedir = $(LIBVISUAL_INCLUDE_DIR)/libvisual
44
library_include_HEADERS = lvconfig.h libvisual.h lv_actor.h \
55
lv_audio.h lv_bin.h lv_common.h lv_fourier.h \
66
lv_input.h lv_event.h lv_keysym.h \
@@ -15,7 +15,7 @@ library_include_HEADERS = lvconfig.h libvisual.h lv_actor.h \
1515
lv_hashlist.h lv_cache.h lv_collection.h \
1616
lv_utils.h lv_os.h lv_math.h lv_gl.h lv_defines.h
1717

18-
lib_LTLIBRARIES = libvisual-0.3.la
18+
lib_LTLIBRARIES = libvisual-@LIBVISUAL_VERSION_SUFFIX@.la
1919

2020
DEFS = @DEFS@
2121

@@ -29,9 +29,9 @@ AM_CFLAGS = -DPLUGPATH="\"$(LIBVISUAL_PLUGINS_BASE_DIR)\"" \
2929
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libvisual \
3030
-I$(top_builddir) -I$(top_builddir)/libvisual
3131

32-
libvisual_0_3_la_LDFLAGS = -export-dynamic -no-undefined
32+
libvisual_@LIBVISUAL_VERSION_SUFFIX@_la_LDFLAGS = -export-dynamic -no-undefined
3333

34-
libvisual_0_3_la_SOURCES = lv_actor.c lv_input.c lv_event.c \
34+
libvisual_@LIBVISUAL_VERSION_SUFFIX@_la_SOURCES = lv_actor.c lv_input.c lv_event.c \
3535
lv_bin.c lv_plugin.c lv_video.c lv_video_simd.c lv_mem.c \
3636
lv_audio.c lv_fourier.c lv_list.c lv_log.c lv_palette.c \
3737
lv_libvisual.c lv_songinfo.c lv_morph.c lv_bmp.c lv_param.c \

0 commit comments

Comments
 (0)