summaryrefslogtreecommitdiffstats
path: root/perl-install/Makefile.drakxtools
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/Makefile.drakxtools')
-rw-r--r--perl-install/Makefile.drakxtools85
1 files changed, 58 insertions, 27 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 35fa5fc70..431f3a85d 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -1,10 +1,14 @@
# -*- Makefile -*-
include Makefile.config
-INLIBDEST_DIRS = Newt c resize_fat xf86misc sbus_probing
-HAVEINST_DIRS = share/po standalone/interactive_http
-DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) ddcprobe harddrake printer serial_probe
+.PHONY: install
+
+INLIBDEST_DIRS = c resize_fat
+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
+XSETUPLEVEL_HARDDRAKE=00
PREFIX =
LIBDIR = $(PREFIX)/usr/lib
MENUDIR= $(LIBDEST)/menu
@@ -12,44 +16,61 @@ DATADIR = $(PREFIX)/usr/share
ICONSDIR= $(DATADIR)/icons
BINDEST = $(PREFIX)/usr/bin
SBINDEST = $(PREFIX)/usr/sbin
+LIBEXECDEST = $(PREFIX)/usr/libexec
ETCDEST = $(PREFIX)/etc/gtk
-BINX11DEST = $(PREFIX)/usr/X11R6/bin
-LIBX11DEST = $(PREFIX)/usr/X11R6/lib/X11
LIBDEST = $(LIBDIR)/$(NAME)
PIXDIR = $(DATADIR)/$(NAME)/pixmaps
INITDIR = $(PREFIX)/etc/rc.d/init.d
.PHONY: $(DIRS)
-all: rpcinfo-flushed $(DIRS)
+all: ../tools/rpcinfo-flushed $(DIRS)
$(DIRS):
install -d auto
- rm -f share/po/DrakX.pot # force rebuild of po's
[ ! -e $@/Makefile ] || $(MAKE) -C $@
install:
- mkdir -p $(BINDEST) $(ETCDEST) $(SBINDEST) $(DATADIR)/{harddrake,pixmaps,icons/{large,mini},autostart} $(BINX11DEST) $(LIBX11DEST) $(PIXDIR) $(INITDIR) $(MENUDIR)
+ 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) $(LIBEXECDEST)
install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
- install $(STANDALONEPMS) standalone/service_harddrake.sh $(SBINDEST)
- install -s rpcinfo-flushed ddcprobe/ddcxinfos serial_probe/serial_probe $(SBINDEST)
- ln -s ../../$(patsubst $(PREFIX)/usr%,%,$(SBINDEST))/XFdrake $(BINX11DEST)/Xdrakres
+ install $(STANDALONEPMS) standalone/convert $(SBINDEST)
+ install -s ../tools/rpcinfo-flushed ../tools/serial_probe/serial_probe $(SBINDEST)
ln -s fileshareset $(SBINDEST)/filesharelist
mv -f $(SBINDEST)/lsnetdrake $(BINDEST)
mv -f $(SBINDEST)/drakbug $(BINDEST)
+ mv -f $(SBINDEST)/drakdvb $(BINDEST)
mv -f $(SBINDEST)/drakhelp $(BINDEST)
+ mv -f $(SBINDEST)/display_help $(BINDEST)
+ mv -f $(SBINDEST)/display_release_notes.pl $(BINDEST)
mv -f $(SBINDEST)/localedrake $(BINDEST)
- mv -f $(SBINDEST)/net_applet $(BINDEST)
+ # All the things handled by polkit
+ mv -f $(SBINDEST)/drak{autologin,auth,boot,clock,font,perm,sec,ups,xservices} $(LIBEXECDEST)
+ mv -f $(SBINDEST)/logdrake $(LIBEXECDEST)/draklog
+ mv -f $(SBINDEST)/drakedm $(LIBEXECDEST)/drakdm
+ mv -f $(SBINDEST)/harddrake2 $(LIBEXECDEST)/drakhardware
+ mv -f $(SBINDEST)/scannerdrake $(LIBEXECDEST)/drakscanner
+ # diskdrake is called by the drakdisk wrapper
+ mv -f $(SBINDEST)/diskdrake $(LIBEXECDEST)
+ install -D standalone/drakdisk $(LIBEXECDEST)
+
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/diskdrake.rc $(DATADIR)/$(NAME)
+ 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
+ install -D standalone/drakdoc $(BINDEST)/
+ install -D standalone/finish-install.xsetup $(PREFIX)/etc/X11/xsetup.d/$(XSETUPLEVEL)finish-install.xsetup
+ install -D standalone/notify-x11-free-driver-switch.xsetup $(PREFIX)/etc/X11/xsetup.d/$(XSETUPLEVEL_HARDDRAKE)notify-x11-free-driver-switch.xsetup
+ install -d $(PREFIX)/etc/sysconfig
+ echo 'FINISH_INSTALL=yes' > $(PREFIX)/etc/sysconfig/finish-install
+
for i in $(HAVEINST_DIRS); do \
- $(MAKE) -C $$i install PREFIX=$(PREFIX) SUDO= DATADIR=$(DATADIR) NAME=$(NAME) ; \
+ $(MAKE) -C $$i install PREFIX=$(PREFIX) SUDO= DATADIR=$(DATADIR) ; \
done
find auto -follow -name .exists -o -name "*.bs" | xargs rm -f
@@ -60,18 +81,28 @@ install:
mv $(LIBDEST)/icons/localedrake-32.png $(ICONSDIR)/localedrake.png
mv $(LIBDEST)/icons/localedrake-48.png $(ICONSDIR)/large/localedrake.png
mv $(LIBDEST)/icons/localedrake-16.png $(ICONSDIR)/mini/localedrake.png
- rmdir $(LIBDEST)/icons/harddrake2/menu
+ rm -rf $(LIBDEST)/icons/harddrake2/menu
+ install -m 644 standalone/menu/*.desktop $(DATADIR)/applications
mv $(LIBDEST)/icons/harddrake2/ $(DATADIR)/pixmaps/
- mv $(SBINDEST)/service_harddrake.sh $(INITDIR)/harddrake
+ mv $(SBINDEST)/convert $(DATADIR)/harddrake
mv $(SBINDEST)/service_harddrake $(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 {net_monitor,$(SBINDEST)/draknet_monitor}
- ln -s {printerdrake,$(SBINDEST)/drakprinter}
- ln -s {scannerdrake,$(SBINDEST)/drakscanner}
+ mv $(SBINDEST)/notify-x11-free-driver-switch $(DATADIR)/harddrake/
+ # 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
+ @make -C share/po libDrakX.pot
+ @make -C standalone/po libDrakX-standalone.pot
+
+../tools/rpcinfo-flushed:
+ cd ../tools; gcc -Wall $(shell pkg-config libtirpc --cflags --libs) rpcinfo-flushed.c -o rpcinfo-flushed