summaryrefslogtreecommitdiffstats
path: root/xorg/xorg-server
diff options
context:
space:
mode:
authorSibelle <lesibel@ree.fr>2010-05-17 23:31:02 +0200
committerSibelle <lesibel@ree.fr>2010-05-17 23:31:02 +0200
commit06483df23b1138cbfd61f7bdf63a2f5d3c9fbf80 (patch)
treeb0d1b48b1dcaa3a5e11f26e3e6969819a902b066 /xorg/xorg-server
parent3228018187a84a4ea85b062dbf284c5660f1cb64 (diff)
parentcf4ac3eea6264ad62e9bfbd9b67bb48c5d70ac45 (diff)
downloadnutyx-pakxe-06483df23b1138cbfd61f7bdf63a2f5d3c9fbf80.tar.gz
nutyx-pakxe-06483df23b1138cbfd61f7bdf63a2f5d3c9fbf80.tar.bz2
nutyx-pakxe-06483df23b1138cbfd61f7bdf63a2f5d3c9fbf80.tar.xz
nutyx-pakxe-06483df23b1138cbfd61f7bdf63a2f5d3c9fbf80.zip
Merge remote branch 'nutyx-attapu/master'
Diffstat (limited to 'xorg/xorg-server')
-rw-r--r--xorg/xorg-server/.Pkgfile.swpbin12288 -> 0 bytes
-rw-r--r--xorg/xorg-server/.footprint2
-rwxr-xr-xxorg/xorg-server/Pkgfile3
3 files changed, 3 insertions, 2 deletions
diff --git a/xorg/xorg-server/.Pkgfile.swp b/xorg/xorg-server/.Pkgfile.swp
deleted file mode 100644
index 342afee00..000000000
--- a/xorg/xorg-server/.Pkgfile.swp
+++ /dev/null
Binary files differ
diff --git a/xorg/xorg-server/.footprint b/xorg/xorg-server/.footprint
index ba1379110..3cd7f3251 100644
--- a/xorg/xorg-server/.footprint
+++ b/xorg/xorg-server/.footprint
@@ -204,6 +204,8 @@ drwxr-xr-x root/root usr/lib/xorg/modules/extensions/
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libextmod.so
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.la
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so
+-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/librecord.la
+-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/librecord.so
-rwxr-xr-x root/root usr/lib/xorg/modules/libexa.la
-rwxr-xr-x root/root usr/lib/xorg/modules/libexa.so
-rwxr-xr-x root/root usr/lib/xorg/modules/libfb.la
diff --git a/xorg/xorg-server/Pkgfile b/xorg/xorg-server/Pkgfile
index c576d68a8..178de7134 100755
--- a/xorg/xorg-server/Pkgfile
+++ b/xorg/xorg-server/Pkgfile
@@ -17,9 +17,8 @@ build() {
--localstatedir=/var \
--sysconfdir=/etc/X11 \
--with-xkb-output=/var/lib/xkb
-# sed -i 's|xorgconfddir = $(prefix)|xorgconfddir = |' config/Makefile
+ sed -i 's|xorgconfddir = $(datadir)|xorgconfddir = /etc|' config/Makefile
make
make DESTDIR=$PKG install
-
rmdir $PKG/var/log
}