Module Name: src
Committed By: ahoka
Date: Fri Jun 5 23:34:36 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
Log Message:
Allow driver version to be set from the makefile instead of
relying on parsing configure scripts.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.13 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.14
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.13 Sun Oct 19 22:05:20 2008
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Fri Jun 5 23:34:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.13 2008/10/19 22:05:20 apb Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.14 2009/06/05 23:34:36 ahoka Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -9,6 +9,11 @@
LIB= ${DRIVER_NAME}
LIBDIR= ${X11USRLIBDIR}/modules/drivers
+# Extract version from configure script if not set in makefile.
+#
+.if defined(DRIVER_VERSION)
+PACKAGE_VERSION= ${DRIVER_VERSION}
+.else
PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "[0-9]+\\.[0-9]+\\.[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
@@ -16,6 +21,7 @@
${X11SRCDIR.${DRIVER}}/configure
PACKAGE_VERSION!= ${PRINT_PACKAGE_VERSION}
+.endif
PACKAGE_MAJOR= ${PACKAGE_VERSION:R:R}
PACKAGE_MINOR= ${PACKAGE_VERSION:R:E}
