summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@herrb.eu>2023-06-17 18:23:41 +0200
committerMatthieu Herrb <matthieu@herrb.eu>2023-06-17 18:23:41 +0200
commit8b6ec6bb08fa9c3b19753acb436bbb8ecfae9233 (patch)
tree6d6a297f9b1cf05b1740d164d0a4a6b1a7f79b73
parent67bc888f643a4fadf41a982153825ea2f3d8195f (diff)
parentdc1f918c15ecca548d8d3d6ec547a6d1cd4dff77 (diff)
Merge remote-tracking branch 'origin/master' into obsd
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 44afe70..5dffe92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = src
diff --git a/configure.ac b/configure.ac
index ef3cadb..6a1c8c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,8 +23,8 @@
# Initialize Autoconf
AC_PREREQ(2.60)
AC_INIT([xf86-video-geode],
- [2.11.20],
- [https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/issues],
+ [2.11.21],
+ [https://gitlab.freedesktop.org/xorg/driver/xf86-video-geode/-/issues],
[xf86-video-geode],
[http://www.x.org/wiki/GeodeDriver])