From bfbd4ee14e2f7c2f7521472deb0d107606b2250f Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Sun, 2 Dec 2012 16:48:50 -0500 Subject: Use udev version instead of eudev version for compatibility The use of the eudev version in pkgconfig files caused build failures, so we switch to the udev version for compatibility purposes. Resolves gentoo/eudev#22 Signed-off-by: Richard Yao --- configure.ac | 1 + docs/gudev/version.xml.in | 2 +- docs/libudev/version.xml.in | 2 +- src/gudev/gudev-1.0.pc.in | 2 +- src/libudev/libudev.pc.in | 2 +- src/udev/udev.pc.in | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index b85f7b3c83..cf30b1bd78 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ([2.68]) AC_INIT([eudev],[0.1],[https://github.com/gentoo/eudev/issues]) +AC_SUBST(UDEV_VERSION, 195) AC_CONFIG_SRCDIR([src/udev/udevd.c]) AC_USE_SYSTEM_EXTENSIONS diff --git a/docs/gudev/version.xml.in b/docs/gudev/version.xml.in index d78bda9342..0a772805a8 100644 --- a/docs/gudev/version.xml.in +++ b/docs/gudev/version.xml.in @@ -1 +1 @@ -@VERSION@ +@UDEV_VERSION@ diff --git a/docs/libudev/version.xml.in b/docs/libudev/version.xml.in index d78bda9342..0a772805a8 100644 --- a/docs/libudev/version.xml.in +++ b/docs/libudev/version.xml.in @@ -1 +1 @@ -@VERSION@ +@UDEV_VERSION@ diff --git a/src/gudev/gudev-1.0.pc.in b/src/gudev/gudev-1.0.pc.in index 058262d767..b398baf0c4 100644 --- a/src/gudev/gudev-1.0.pc.in +++ b/src/gudev/gudev-1.0.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gudev-1.0 Description: GObject bindings for libudev -Version: @VERSION@ +Version: @UDEV_VERSION@ Requires: glib-2.0, gobject-2.0 Libs: -L${libdir} -lgudev-1.0 Cflags: -I${includedir}/gudev-1.0 diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in index dad7139c85..8279ccf04a 100644 --- a/src/libudev/libudev.pc.in +++ b/src/libudev/libudev.pc.in @@ -12,7 +12,7 @@ includedir=@includedir@ Name: libudev Description: Library to access udev device information -Version: @VERSION@ +Version: @UDEV_VERSION@ Libs: -L${libdir} -ludev -lrt Libs.private: Cflags: -I${includedir} diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in index 2079574684..092f1c6ed0 100644 --- a/src/udev/udev.pc.in +++ b/src/udev/udev.pc.in @@ -4,4 +4,4 @@ udevdir=@udevlibexecdir@ Name: udev Description: Part of eudev -Version: @VERSION@ +Version: @UDEV_VERSION@ -- cgit v1.2.3-54-g00ecf