diff --git a/Makefile.am b/Makefile.am index bd7ad7b..f09d584 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,9 @@ cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \ -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-maybe-uninitialized +cava_font_dir = /usr/share/consolefonts +cava_font__DATA = cava.psf + if !SYSTEM_LIBINIPARSER cava_SOURCES += iniparser/libiniparser.la cava_LDADD += -Liniparser/.libs diff --git a/autogen.sh b/autogen.sh index ae466bd..c6a8875 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,11 @@ #!/bin/sh + +if [ -d .git ]; then + git describe --always --tags --dirty > version # get version from git +else + echo 0.4.2 > version # hard coded versions +fi + libtoolize aclocal autoconf diff --git a/configure.ac b/configure.ac index 6121362..3f0a247 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([cava], [m4_esyscmd_s([git describe --always --tags --dirty])], [karl@stavestrand.no]) +AC_INIT([cava], [m4_esyscmd_s([cat version])], [karl@stavestrand.no]) AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign]) dnl AC_CONFIG_MACRO_DIRS([m4]) AM_PROG_AR