diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2014-06-28 09:23:58 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2014-06-28 09:23:58 -0700 |
| commit | a46a3130d305a6a91a63fa498c4bc40edaa4693d (patch) | |
| tree | 382820568a99ce6259a2b6cc8739160628051d43 /xorg/server/Makefile | |
| parent | cbc8317c6de51fbb40edf18b4fa72ec69ce458f4 (diff) | |
| parent | 7ba03425e52c02731253946000d053d46ca167bb (diff) | |
| download | xrdp-proprietary-a46a3130d305a6a91a63fa498c4bc40edaa4693d.tar.gz xrdp-proprietary-a46a3130d305a6a91a63fa498c4bc40edaa4693d.zip | |
Merge pull request #149 from metalefty/xorg-driver-makefile
xorg: get xorg module directory via pkg-config
Diffstat (limited to 'xorg/server/Makefile')
| -rw-r--r-- | xorg/server/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xorg/server/Makefile b/xorg/server/Makefile index 1aed58ad..e5ae5771 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,8 @@ 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 --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 |