summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-21 16:59:51 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-21 16:59:51 +0000
commitb00dbddd2710e4b50d31da46a31b791450c1905b (patch)
treee7524e2b832a69d1bc86294214b18a8e50c9617b
parente219385e870764ee4a6b7f9d26e8617eec60f172 (diff)
downloaddrakx-b00dbddd2710e4b50d31da46a31b791450c1905b.tar
drakx-b00dbddd2710e4b50d31da46a31b791450c1905b.tar.gz
drakx-b00dbddd2710e4b50d31da46a31b791450c1905b.tar.bz2
drakx-b00dbddd2710e4b50d31da46a31b791450c1905b.tar.xz
drakx-b00dbddd2710e4b50d31da46a31b791450c1905b.zip
install notify-x11-free-driver-switch files
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/Makefile.drakxtools3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 3296bd7f4..568df3eef 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -9,7 +9,7 @@ SO_FILES = c/blib/arch/auto/c/c.so
PMS_DIRS = c diskdrake harddrake interactive modules partition_table resize_fat security fs fs/remote
PMS = *.pm $(PMS_DIRS:%=%/*.pm) install/*.pm install/help/*.pm install/commands install/install2
-STANDALONEPMS_ = adduserdrake bootloader-config diskdrake drakauth drakboot drakbug drakbug_report drakclock drakedm drakfont drakhelp drakperm draksec draksound draksplash drakupdate_fstab drakups drakxservices drakxtv fileshareset finish-install harddrake2 localedrake logdrake lsnetdrake scannerdrake service_harddrake service_harddrake_confirm
+STANDALONEPMS_ = adduserdrake bootloader-config diskdrake drakauth drakboot drakbug drakbug_report drakclock drakedm drakfont drakhelp drakperm draksec draksound draksplash drakupdate_fstab drakups drakxservices drakxtv fileshareset finish-install harddrake2 localedrake logdrake lsnetdrake scannerdrake service_harddrake service_harddrake_confirm notify-x11-free-driver-switch
STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
ALLPMS = $(PMS) $(STANDALONEPMS)
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index bad4c7731..6cab7b12d 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -6,6 +6,7 @@ HAVEINST_DIRS = share/po standalone/po standalone/interactive_http standalone/me
DIRS = $(INLIBDEST_DIRS) $(HAVEINST_DIRS) harddrake printer ../tools/serial_probe standalone/menu
NAME = libDrakX
XSETUPLEVEL=40
+XSETUPLEVEL_HARDDRAKE=00
PREFIX =
LIBDIR = $(PREFIX)/usr/lib
MENUDIR= $(LIBDEST)/menu
@@ -47,6 +48,7 @@ install:
echo 'RESTRICT=yes' > $(PREFIX)/etc/security/fileshare.conf
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
@@ -68,6 +70,7 @@ install:
mv $(SBINDEST)/service_harddrake.sh $(INITDIR)/harddrake
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}