diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-09-04 16:24:26 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-09-04 17:46:58 +0100 |
| commit | d14826136b6639703d210debc969d75e11259778 (patch) | |
| tree | d2eb9d06beb3c65a5026033ce905ea1a6cf3ee68 | |
| parent | e08b18f96a412126e23931c31d2ad16f073d74c9 (diff) | |
| download | drakx-kbd-mouse-x11-d14826136b6639703d210debc969d75e11259778.tar drakx-kbd-mouse-x11-d14826136b6639703d210debc969d75e11259778.tar.gz drakx-kbd-mouse-x11-d14826136b6639703d210debc969d75e11259778.tar.bz2 drakx-kbd-mouse-x11-d14826136b6639703d210debc969d75e11259778.tar.xz drakx-kbd-mouse-x11-d14826136b6639703d210debc969d75e11259778.zip | |
Remove /sbin install path post usrmove
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | NEWS | 2 |
2 files changed, 5 insertions, 6 deletions
@@ -4,7 +4,6 @@ DESTDIR= libdir=/usr/lib bindir=/usr/bin sbindir=/usr/sbin -rootsbindir=/sbin desktopdir=/usr/share/applications autostartdir=/usr/share/autostart xinitdir=/etc/X11/xinit.d @@ -12,8 +11,7 @@ iconsdir=/usr/lib/libDrakX/icons pixmapsdir=/usr/share/libDrakX/pixmaps BIN_TOOLS= -SBIN_TOOLS= keyboarddrake mousedrake XFdrake drakx-update-background -ROOTSBIN_TOOLS = display_driver_helper +SBIN_TOOLS= keyboarddrake mousedrake XFdrake drakx-update-background display_driver_helper INLIBDEST_DIRS = lib/xf86misc all: $(INLIBDEST_DIRS) @@ -26,7 +24,7 @@ check: @for p in tools/*; do head -n1 $$p | grep perl || continue; perl -cw $$p || exit 1; done install: - install -d $(DESTDIR){$(libdir),$(bindir),$(sbindir),$(rootsbindir),$(desktopdir),$(autostartdir),$(xinitdir),$(iconsdir),$(pixmapsdir)} + install -d $(DESTDIR){$(libdir),$(bindir),$(sbindir),$(desktopdir),$(autostartdir),$(xinitdir),$(iconsdir),$(pixmapsdir)} install -d $(INLIBDEST_DIRS:%=$(DESTDIR)$(libdir)/libDrakX//%) cp -a lib/*.pm $(DESTDIR)$(libdir)/libDrakX/ @@ -36,8 +34,7 @@ install: (cd lib; for i in */; do install -d $(DESTDIR)$(libdir)/libDrakX/$$i ; install -m 644 $$i/*.pm $(DESTDIR)$(libdir)/libDrakX/$$i/;done) (cd tools; \ [[ -n "$(BIN_TOOLS)" ]] && install -m755 $(BIN_TOOLS) $(DESTDIR)$(bindir); \ - [[ -n "$(ROOTSBIN_TOOLS)" ]] && install -m755 $(ROOTSBIN_TOOLS) $(DESTDIR)$(rootsbindir); \ - install -m755 $(SBIN_TOOLS) $(DESTDIR)$(sbindir); \ + [[ -n "$(SBIN_TOOLS)" ]] && install -m755 $(SBIN_TOOLS) $(DESTDIR)$(sbindir); \ ) #install -m644 $(wildcard data/*.desktop) $(DESTDIR)$(desktopdir) #install -m644 $(wildcard data/icons/*.png) $(DESTDIR)$(iconsdir) @@ -1,3 +1,5 @@ +- remove / and /usr separation (no longer needed since usrmove) + Version 0.109 - 8 May 2013 - install drakx-update-background (in /usr/sbin) |