diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2014-06-29 13:40:10 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2014-06-29 13:40:10 -0700 |
| commit | dfff82f5febc7b9074eb32d6a8a2473bd6c8ec75 (patch) | |
| tree | 8edfb5d02e09d27654b0c85487e01e86509ea3d1 | |
| parent | faa0ab1f361b3b530853d432ee519804fb926001 (diff) | |
| parent | fd003670d67489ddb56c093462dcdd48f9de21b8 (diff) | |
| download | xrdp-proprietary-dfff82f5febc7b9074eb32d6a8a2473bd6c8ec75.tar.gz xrdp-proprietary-dfff82f5febc7b9074eb32d6a8a2473bd6c8ec75.zip | |
Merge pull request #150 from metalefty/xorg-driver-makefile
xorg: explicitly make and specify install target directory
| -rw-r--r-- | xorg/server/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xorg/server/Makefile b/xorg/server/Makefile index e5ae5771..793334c7 100644 --- a/xorg/server/Makefile +++ b/xorg/server/Makefile @@ -22,14 +22,15 @@ xinstall: strip xrdpmouse/xrdpmouse_drv.so strip xrdpkeyb/xrdpkeyb_drv.so + mkdir -p $(HOME)/xorg-modules/drivers $(HOME)/xorg-modules/input cp module/libxorgxrdp.so $(HOME)/xorg-modules/ cp xrdpdev/xrdpdev_drv.so $(HOME)/xorg-modules/drivers/ cp xrdpmouse/xrdpmouse_drv.so $(HOME)/xorg-modules/input/ cp xrdpkeyb/xrdpkeyb_drv.so $(HOME)/xorg-modules/input/ install: - install --directory $(DESTDIR)$(moduledir) + install --directory $(DESTDIR)$(moduledir) $(DESTDIR)$(moduledir)/drivers $(DESTDIR)$(moduledir)/input 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 + 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/ |