xf86-video-intel: 2 commits - configure.ac man/Makefile.am

[Eric Anholt]

 configure.ac    |    6 +++---
 man/Makefile.am |   13 ++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

New commits:
diff-tree 08cd5f9b0f086e51112008d50de48556372899f9 (from bf9771e9711361632afe3abeeedca7ce03497005)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Apr 10 11:26:46 2007 -0700

    Bug #10520: i810 manpage not installed despite users expecting it to be there.
    
    Install it as an alias to intel.4x, since we're letting people load the driver
    as "i810" still.

diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..b5510e8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,9 +27,13 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
+DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%)
+
 driverman_PRE = @DRIVER_NAME at .man
 
-driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
+driverman_DATA = \
+	$(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \
+	i810. at DRIVER_MAN_SUFFIX@
 
 EXTRA_DIST = @DRIVER_NAME at .man
 
@@ -57,3 +61,10 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
+
+BUILT_SOURCES = shadows.DONE
+
+shadows.DONE:
+	-rm -f i810. at DRIVER_MAN_SUFFIX@
+	echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \
+		i810. at DRIVER_MAN_SUFFIX@
diff-tree bf9771e9711361632afe3abeeedca7ce03497005 (from 656fbd952542ba5ddc9b018071008ceb38b1bd19)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Apr 9 15:26:05 2007 -0700

    Don't use extended regexps in sed when not necessary.
    
    Some seds require a flag to enable extended regexps.

diff --git a/configure.ac b/configure.ac
index 0f7fca6..2d26553 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,13 +27,13 @@ AC_INIT([xf86-video-intel],
         xf86-video-intel)
 
 AC_DEFINE_UNQUOTED([INTEL_VERSION_MAJOR],
-		   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\+\)\.[[0-9]]\+\.[[0-9]]\+/\1/')],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]*\)\.[[0-9]]*\.[[0-9]]*/\1/')],
 		   [Major version])
 AC_DEFINE_UNQUOTED([INTEL_VERSION_MINOR],
-		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\+\.\([[0-9]]\+\)\.[[0-9]]\+/\1/')],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*/\1/')],
 		   [Minor version])
 AC_DEFINE_UNQUOTED([INTEL_VERSION_PATCH],
-		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\+\.[[0-9]]\+\.\([[0-9]]\+\)/\1/')],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)/\1/')],
 		   [Patch version])
 
 AC_CONFIG_SRCDIR([Makefile.am])