diff options
Diffstat (limited to 'perl-install/Makefile.drakxtools')
| -rw-r--r-- | perl-install/Makefile.drakxtools | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index fa5ab4b51..1ef2bf6d1 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -4,7 +4,7 @@ include Makefile.config .PHONY: install INLIBDEST_DIRS = c resize_fat -HAVEINST_DIRS = share/po standalone/po standalone/interactive_http standalone/menu +HAVEINST_DIRS = share/po standalone/po standalone/interactive_http standalone/menu standalone/polkit DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) harddrake ../tools/serial_probe NAME = libDrakX XSETUPLEVEL=40 @@ -16,6 +16,7 @@ DATADIR = $(PREFIX)/usr/share ICONSDIR= $(DATADIR)/icons BINDEST = $(PREFIX)/usr/bin SBINDEST = $(PREFIX)/usr/sbin +LIBEXECDEST = $(PREFIX)/usr/libexec ETCDEST = $(PREFIX)/etc/gtk LIBDEST = $(LIBDIR)/$(NAME) PIXDIR = $(DATADIR)/$(NAME)/pixmaps @@ -30,11 +31,10 @@ $(DIRS): install: perl -pi -e "s/\"VER\"(; # version)/\"$(VERSION)\"\1/" standalone.pm - mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{applications,harddrake,pixmaps,icons/{large,mini},autostart} $(PIXDIR) $(INITDIR) $(MENUDIR) + mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{applications,harddrake,pixmaps,icons/{large,mini},autostart} $(PIXDIR) $(INITDIR) $(MENUDIR) $(LIBEXECDEST) install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%) install $(STANDALONEPMS) standalone/convert $(SBINDEST) install -s ../tools/rpcinfo-flushed ../tools/serial_probe/serial_probe $(SBINDEST) - ln -s XFdrake $(SBINDEST)/Xdrakres ln -s fileshareset $(SBINDEST)/filesharelist mv -f $(SBINDEST)/lsnetdrake $(BINDEST) mv -f $(SBINDEST)/drakbug $(BINDEST) @@ -43,11 +43,20 @@ install: mv -f $(SBINDEST)/display_help $(BINDEST) mv -f $(SBINDEST)/display_release_notes.pl $(BINDEST) mv -f $(SBINDEST)/localedrake $(BINDEST) + # All the things handled by polkit + mv -f $(SBINDEST)/drak{auth,boot,clock,font,perm,sec,ups,xservices} $(LIBEXECDEST) + mv -f $(SBINDEST)/logdrake $(LIBEXECDEST)/draklog + mv -f $(SBINDEST)/drakedm $(LIBEXECDEST)/drakdm + mv -f $(SBINDEST)/diskdrake $(LIBEXECDEST)/drakdisk + mv -f $(SBINDEST)/harddrake2 $(LIBEXECDEST)/drakhardware + mv -f $(SBINDEST)/scannerdrake $(LIBEXECDEST)/drakscanner + install -m 644 *.pm $(LIBDEST) for i in $(PMS_DIRS); do install -d $(LIBDEST)/$$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done install -m 644 pixmaps/*.* $(PIXDIR) install -m 644 share/*.rc $(DATADIR)/$(NAME) + install -m 644 share/*.css $(DATADIR)/$(NAME) install -d $(PREFIX)/etc/security echo 'RESTRICT=yes' > $(PREFIX)/etc/security/fileshare.conf @@ -75,15 +84,17 @@ install: mv $(SBINDEST)/convert $(DATADIR)/harddrake mv $(SBINDEST)/service_harddrake $(DATADIR)/harddrake/ mv $(SBINDEST)/notify-x11-free-driver-switch $(DATADIR)/harddrake/ - ln -s {XFdrake,$(SBINDEST)/drakx11} - ln -s {diskdrake,$(SBINDEST)/drakdisk} - ln -s {drakclock,$(SBINDEST)/clock.pl} - ln -s {harddrake2,$(SBINDEST)/drakhardware} - ln -s {keyboarddrake,$(SBINDEST)/drakkeyboard} - ln -s {localedrake,$(BINDEST)/draklocale} - ln -s {logdrake,$(SBINDEST)/draklog} - ln -s {mousedrake,$(SBINDEST)/drakmouse} - ln -s {scannerdrake,$(SBINDEST)/drakscanner} + # Better public names + mv $(BINDEST)/localedrake $(BINDEST)/draklocale + # Compatibility names/links + # (ideally everything would be in /usr/bin...) + ln -s ../bin/drakdm $(SBINDEST)/drakedm + ln -s ../bin/drakdisk $(SBINDEST)/diskdrake + ln -s ../bin/drakhardware $(SBINDEST)/harddrake2 + ln -s ../bin/drakscanner $(SBINDEST)/scannerdrake + ln -s drakclock $(BINDEST)/clock.pl + ln -s draklocale $(BINDEST)/localedrake + ln -s draklog $(BINDEST)/logdrake check: rm -f share/po/libDrakX.pot standalone/po/libDrakX-standalone.pot |