From 9b218be9c11562538690b0c0a4c220e7978c1e74 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Sun, 29 Jun 2014 00:31:42 +0900 Subject: xorg: get xorg module directory via pkg-config --- xorg/server/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'xorg/server/Makefile') diff --git a/xorg/server/Makefile b/xorg/server/Makefile index 1aed58ad..2ea7ec0a 100644 --- a/xorg/server/Makefile +++ b/xorg/server/Makefile @@ -1,3 +1,4 @@ +moduledir := $(shell pkg-config xorg-server --variable moduledir) all: allmake @@ -27,7 +28,7 @@ xinstall: cp xrdpkeyb/xrdpkeyb_drv.so $(HOME)/xorg-modules/input/ install: - install --mode=0644 --strip module/libxorgxrdp.so /usr/lib/xorg/modules - install --mode=0644 --strip xrdpdev/xrdpdev_drv.so /usr/lib/xorg/modules/drivers - install --mode=0644 --strip xrdpmouse/xrdpmouse_drv.so /usr/lib/xorg/modules/input - install --mode=0644 --strip xrdpkeyb/xrdpkeyb_drv.so /usr/lib/xorg/modules/input + install --mode=0644 --strip module/libxorgxrdp.so $(moduledir) + install --mode=0644 --strip xrdpdev/xrdpdev_drv.so $(moduledir)/drivers + install --mode=0644 --strip xrdpmouse/xrdpmouse_drv.so $(moduledir)/input + install --mode=0644 --strip xrdpkeyb/xrdpkeyb_drv.so $(moduledir)/input -- cgit v1.2.1 From 7ba03425e52c02731253946000d053d46ca167bb Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Sun, 29 Jun 2014 00:37:29 +0900 Subject: xorg: respect DESTDIR variable for packaging --- xorg/server/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'xorg/server/Makefile') diff --git a/xorg/server/Makefile b/xorg/server/Makefile index 2ea7ec0a..e5ae5771 100644 --- a/xorg/server/Makefile +++ b/xorg/server/Makefile @@ -28,7 +28,8 @@ xinstall: cp xrdpkeyb/xrdpkeyb_drv.so $(HOME)/xorg-modules/input/ install: - install --mode=0644 --strip module/libxorgxrdp.so $(moduledir) - install --mode=0644 --strip xrdpdev/xrdpdev_drv.so $(moduledir)/drivers - install --mode=0644 --strip xrdpmouse/xrdpmouse_drv.so $(moduledir)/input - install --mode=0644 --strip xrdpkeyb/xrdpkeyb_drv.so $(moduledir)/input + install --directory $(DESTDIR)$(moduledir) + install --mode=0644 --strip module/libxorgxrdp.so $(DESTDIR)$(moduledir) + install --mode=0644 --strip xrdpdev/xrdpdev_drv.so $(DESTDIR)$(moduledir)/drivers + install --mode=0644 --strip xrdpmouse/xrdpmouse_drv.so $(DESTDIR)$(moduledir)/input + install --mode=0644 --strip xrdpkeyb/xrdpkeyb_drv.so $(DESTDIR)$(moduledir)/input -- cgit v1.2.1