diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | hw/xfree86/dri/Makefile.am | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/drm/Makefile.am | 2 | ||||
| -rw-r--r-- | xorg-server.pc.in | 2 |
4 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,14 @@ +2005-08-30 Kristian Høgsberg <krh@redhat.com> + + * hw/xfree86/dri/Makefile.am: + * hw/xfree86/os-support/drm/Makefile.am: Use the $(moduledir) + makefile variable instead of @moduledir@ so it can be overridden + at make install time. + + * xorg-server.pc.in: Remove driverdir and inputdir from pkg-config + file. The directory layout of moduledir is fixed and well known + by drivers. + Thu Aug 25 17:15:01 2005 Søren Sandmann <sandmann@redhat.com> * hw/xfree86/i2c/Makefile.am (module_LTLIBRARIES): Add all the diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 737930329..68eac1d40 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -10,7 +10,7 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ @DRIPROTO_CFLAGS@ \ @LIBDRM_CFLAGS@ libdri_la_LDFLAGS = -module -avoid-version -libdri_ladir = @moduledir@/extensions +libdri_ladir = $(moduledir)/extensions libdri_la_SOURCES = \ dri.c \ dri.h \ diff --git a/hw/xfree86/os-support/drm/Makefile.am b/hw/xfree86/os-support/drm/Makefile.am index fde53ecec..bc9b078f6 100644 --- a/hw/xfree86/os-support/drm/Makefile.am +++ b/hw/xfree86/os-support/drm/Makefile.am @@ -9,7 +9,7 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -DHAVE_XORG_CONFIG_H \ @LIBDRM_CFLAGS@ libdrm_la_LDFLAGS = -module -avoid-version -libdrm_ladir = @moduledir@/@XORG_OS@ +libdrm_ladir = $(moduledir)/@XORG_OS@ libdrm_la_SOURCES = \ xf86drm.c \ xf86drmHash.c \ diff --git a/xorg-server.pc.in b/xorg-server.pc.in index f7f8271a0..60fb04cb9 100644 --- a/xorg-server.pc.in +++ b/xorg-server.pc.in @@ -4,8 +4,6 @@ libdir=@libdir@ includedir=@includedir@ moduledir=@moduledir@ sdkdir=@sdkdir@ -driverdir=@moduledir@/drivers -inputdir=@moduledir@/input Name: xorg-server Description: Modular X.Org X Server |