Use the $(moduledir) makefile variable instead of @moduledir@ so it can be
overridden at make install time. Remove driverdir and inputdir from pkg-config file. The directory layout of moduledir is fixed and well known by drivers.
This commit is contained in:
parent
b4f4bf028a
commit
fa6fbd018d
11
ChangeLog
11
ChangeLog
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user