Skip to content

Commit b842b38

Browse files
author
Tibor Benke
committed
configure: use PACKAGE_VERSION variable instead of VERSION
The AC_INIT macro will define the PACKAGE_VERSION variable: http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Initializing-configure.html#AC%5fINIT I kept the #define name `SYSLOG_NG_VERSION` for backward compatibility with incubator. Signed-off-by: Tibor Benke <tibor.benke@balabit.com>
1 parent 06b881c commit b842b38

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

configure.ac

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fi
5959
AM_INIT_AUTOMAKE([foreign no-define subdir-objects])
6060
_AM_PROG_TAR([ustar])
6161
if test -n "$SNAPSHOT_VERSION"; then
62-
VERSION=$VERSION+$SNAPSHOT_VERSION
62+
PACKAGE_VERSION=$PACKAGE_VERSION+$SNAPSHOT_VERSION
6363
fi
6464

6565
if test "x$prefix" = "xNONE"; then
@@ -1404,7 +1404,7 @@ AC_DEFINE_UNQUOTED(JOURNALD_OPTIONAL, 1, ["Enable systemd-journal source if jour
14041404
AC_DEFINE_UNQUOTED(JOURNALD_SYSTEM, 2, ["Force systemd-journal source to use system's journald"])
14051405

14061406
AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$PACKAGE_NAME", [package name])
1407-
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [version number])
1407+
AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", [version number])
14081408
AC_DEFINE_UNQUOTED(SOURCE_REVISION, "$SOURCE_REVISION", [source revision])
14091409
AC_DEFINE_UNQUOTED(LICENSE_VERSION, "$LICENSE_VERSION", [Required license version])
14101410

@@ -1535,7 +1535,7 @@ AC_OUTPUT(dist.conf
15351535
)
15361536

15371537
echo
1538-
echo "syslog-ng Open Source Edition $VERSION configured"
1538+
echo "syslog-ng Open Source Edition $PACKAGE_VERSION configured"
15391539
echo " Compiler options:"
15401540
echo " compiler : $CC"
15411541
echo " compiler options : $CFLAGS $CPPFLAGS"

debian/changelog.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@PACKAGE_NAME@ (@VERSION@) @RELEASE_TAG@; urgency=low
1+
@PACKAGE_NAME@ (@PACKAGE_VERSION@) @RELEASE_TAG@; urgency=low
22

33
* New upstream version.
44

lib/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include lib/debugger/Makefile.am
1414
include lib/compat/Makefile.am
1515
include lib/logmsg/Makefile.am
1616

17-
LSNG_RELEASE = $(shell echo @VERSION@ | cut -d. -f1,2)
17+
LSNG_RELEASE = $(shell echo @PACKAGE_VERSION@ | cut -d. -f1,2)
1818

1919
# * Start with version information of ‘0:0:0’ for each libtool
2020
# library.

libtest/syslog-ng-test.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ includedir=@includedir@
77

88
Name: syslog-ng-test
99
Description: Test helper package for syslog-ng modules
10-
Version: @VERSION@
10+
Version: @PACKAGE_VERSION@
1111
Requires.private: glib-2.0 syslog-ng
1212
Libs: -L${pkglibdir}/libtest -lsyslog-ng-test
1313
Cflags: -I${includedir}/syslog-ng/libtest

syslog-ng.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ivykis=@with_ivykis@
1313

1414
Name: syslog-ng-dev
1515
Description: Dev package for syslog-ng module
16-
Version: @VERSION@
16+
Version: @PACKAGE_VERSION@
1717
Requires: glib-2.0 eventlog
1818
Libs: -L${libdir} @GLIB_LIBS@ -lsyslog-ng
1919
Cflags: -I${includedir}/syslog-ng @INTERNAL_IVYKIS_CFLAGS@

syslog-ng.spec.in

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Summary: Next generation system logging daemon
22
Name: @PACKAGE_NAME@
3-
Version: @VERSION@
3+
Version: @PACKAGE_VERSION@
44
Release: 1
55
License: GPL
66
Group: System Environment/Daemons
@@ -94,21 +94,21 @@ elif [ "%{_host_vendor}" = "redhat" ] || [ "%{_host_vendor}" = "suse" ]; then
9494
fi
9595

9696
# install documentation
97-
[ -d "${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@VERSION@" ] || ./install-sh -d "${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@VERSION@"
97+
[ -d "${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@PACKAGE_VERSION@" ] || ./install-sh -d "${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@PACKAGE_VERSION@"
9898
./install-sh -o root -g root -m 0644 NEWS \
99-
${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@VERSION@/NEWS
99+
${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@PACKAGE_VERSION@/NEWS
100100
./install-sh -o root -g root -m 0644 AUTHORS \
101-
${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@VERSION@/AUTHORS
101+
${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@PACKAGE_VERSION@/AUTHORS
102102
./install-sh -o root -g root -m 0644 COPYING \
103-
${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@VERSION@/COPYING
103+
${RPM_BUILD_ROOT}/%{_prefix}/share/doc/syslog-ng-@PACKAGE_VERSION@/COPYING
104104

105105
%files
106106
%defattr(-,root,root)
107107
%{prefix}/sbin/syslog-ng
108108
%{prefix}/bin/loggen
109109
%{_mandir}/*
110-
%docdir %{_prefix}/share/doc/syslog-ng-@VERSION@
111-
%{_prefix}/share/doc/syslog-ng-@VERSION@/*
110+
%docdir %{_prefix}/share/doc/syslog-ng-@PACKAGE_VERSION@
111+
%{_prefix}/share/doc/syslog-ng-@PACKAGE_VERSION@/*
112112
%config(noreplace) /etc/syslog-ng/syslog-ng.conf
113113
%ifnos aix5.2
114114
/etc/rc.d/init.d/syslog-ng
@@ -234,11 +234,11 @@ fi
234234
[ $RPM_BUILD_ROOT = / ] || rm -rf $RPM_BUILD_ROOT
235235

236236
%changelog
237-
* Mon Sep 14 2009 Balazs Scheidler <bazsi@balabit.com> @VERSION@-1
237+
* Mon Sep 14 2009 Balazs Scheidler <bazsi@balabit.com> @PACKAGE_VERSION@-1
238238
- Removed some more Premium Edition related cruft.
239-
* Wed Sep 02 2009 Balazs Scheidler <bazsi@balabit.com> @VERSION@-1
239+
* Wed Sep 02 2009 Balazs Scheidler <bazsi@balabit.com> @PACKAGE_VERSION@-1
240240
- Removed the references to the documentation and libzlicense-devel
241-
* Wed Apr 04 2007 Tamas Pal <folti@balabit.com> @VERSION@-1
241+
* Wed Apr 04 2007 Tamas Pal <folti@balabit.com> @PACKAGE_VERSION@-1
242242
- Added libnet-devel and libzlicense-devel to BuildRequires.
243243
- Changed Packager to Tamas Pal.
244244
- Changed license to BalaBit Proprietary one.

0 commit comments

Comments
 (0)