Skip to content

Commit 4a8cdbc

Browse files
author
SZALAY Attila
committed
configure.ac: Added package version information
1 parent 20e64ba commit 4a8cdbc

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
SUBDIRS = iptables pylib
22

3-
ksrcdir = $(prefix)/src
3+
ksrcdir = $(prefix)/src/kzorp-$(PACKAGE_VERSION)
44

5-
ksrctestdir = $(prefix)/src/tests
5+
ksrctestdir = $(ksrcdir)/tests
66

7-
ksrcpytestdir = $(prefix)/src/tests/pytests
7+
ksrcpytestdir = $(ksrcdir)/tests/pytests
88

9-
ksrcincdir = $(prefix)/src/include
9+
ksrcincdir = $(ksrcdir)/include
1010

1111
ksrc_DATA = kernel-module/dkms.conf\
1212
kernel-module/kzorp_core.c\

configure.ac

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
AC_INIT([kzorp-iptables], [0])
1+
AC_INIT([kzorp-iptables], m4_esyscmd([tr -d '\n' <VERSION]))
22
AC_CONFIG_AUX_DIR([build-aux])
33
AC_CONFIG_HEADERS([config.h])
44
AC_CONFIG_MACRO_DIR([m4])
55
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
66
AM_SILENT_RULES([yes])
77
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
88

9-
VERSION=`cat $srcdir/VERSION`
109

1110
AC_PROG_INSTALL
1211
AC_PROG_CC
@@ -36,7 +35,7 @@ regular_CFLAGS="$CFLAGS -Wall -Waggregate-return -Wmissing-declarations \
3635
AC_SUBST([regular_CPPFLAGS])
3736
AC_SUBST([regular_CFLAGS])
3837
AC_SUBST([xtlibdir])
39-
AC_SUBST([VERSION])
38+
AC_SUBST([PACKAGE_VERSION])
4039
AC_CONFIG_FILES([Makefile
4140
iptables/Makefile
4241
pylib/Makefile

0 commit comments

Comments
 (0)