diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-10-12 13:20:44 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-10-12 13:23:57 +0100 |
| commit | ec9747937aafaa91aa04e969ad255899415ba4e4 (patch) | |
| tree | 133703e814f7ae1b15dfbc6a6723ae1f053a51d3 /Makefile | |
| parent | 0aeb6cd9396b3ab4dc52a7d330ca5484545b9c58 (diff) | |
| download | drakx-net-ec9747937aafaa91aa04e969ad255899415ba4e4.tar drakx-net-ec9747937aafaa91aa04e969ad255899415ba4e4.tar.gz drakx-net-ec9747937aafaa91aa04e969ad255899415ba4e4.tar.bz2 drakx-net-ec9747937aafaa91aa04e969ad255899415ba4e4.tar.xz drakx-net-ec9747937aafaa91aa04e969ad255899415ba4e4.zip | |
polkit: Tidy up polkit support
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
@@ -10,8 +10,6 @@ desktopdir=/usr/share/applications autostartdir=/etc/xdg/autostart iconsdir=/usr/lib/libDrakX/icons pixmapsdir=/usr/share/libDrakX/pixmaps -pamdir=/etc/pam.d -consoleappsdir=/etc/security/console.apps USER_TOOLS=net_applet ROOT_TOOLS=drakconnect drakfirewall drakgw drakhosts drakids drakinvictus draknetprofile draknfs drakproxy drakroam draksambashare drakvpn draknetcenter @@ -19,7 +17,7 @@ ROOT_TOOLS=drakconnect drakfirewall drakgw drakhosts drakids drakinvictus drakne all: (find lib -name '*.pm'; find bin -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g' make -C po - make -C polkit/policy + make -C polkit make -C data check: @@ -27,21 +25,19 @@ check: @for p in bin/*; do perl -cw $$p || exit 1; done install: - install -d $(DESTDIR){$(libdir),$(bindir),$(libexecdir),$(desktopdir),$(autostartdir),$(iconsdir),$(pixmapsdir),$(pamdir),$(consoleappsdir)} + install -d $(DESTDIR){$(libdir),$(bindir),$(libexecdir),$(desktopdir),$(autostartdir),$(iconsdir),$(pixmapsdir)} cp -a lib/* $(DESTDIR)$(libdir)/libDrakX/ find $(DESTDIR) -name .perl_checker -exec rm {} \; (cd bin && \ install -m755 $(USER_TOOLS) $(DESTDIR)$(bindir) && \ - install -m755 $(ROOT_TOOLS) $(DESTDIR)$(libexecdir) && \ - cd ../polkit/wrappers && \ - install -m755 $(ROOT_TOOLS) $(DESTDIR)$(bindir) \ + install -m755 $(ROOT_TOOLS) $(DESTDIR)$(libexecdir) \ ) install -m644 $(wildcard data/*.desktop) $(DESTDIR)$(desktopdir) install -m644 $(wildcard data/icons/*.png) $(DESTDIR)$(iconsdir) install -m644 $(wildcard data/pixmaps/*.png) $(DESTDIR)$(pixmapsdir) perl -pe 's/\s+--force//g' $(DESTDIR)$(desktopdir)/net_applet.desktop > $(DESTDIR)$(autostartdir)/net_applet.desktop make -C po install - make -C polkit/policy install + make -C polkit install cleandist: rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar* @@ -54,6 +50,7 @@ dist: cleandist clean: make -C po clean + make -C polkit clean .PHONY: ChangeLog log changelog |