summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-09-04 18:29:16 +0100
committerColin Guthrie <colin@mageia.org>2013-09-04 19:59:00 +0100
commit73c9d1728a257cf1886db6377d5dbda835e8fb2d (patch)
tree933f1a61af477cb3b9243b731eeee4353a4133e8
parent52a0f3cb0e520ffeab6d64b20c96746727424ac6 (diff)
downloaddrakx-73c9d1728a257cf1886db6377d5dbda835e8fb2d.tar
drakx-73c9d1728a257cf1886db6377d5dbda835e8fb2d.tar.gz
drakx-73c9d1728a257cf1886db6377d5dbda835e8fb2d.tar.bz2
drakx-73c9d1728a257cf1886db6377d5dbda835e8fb2d.tar.xz
drakx-73c9d1728a257cf1886db6377d5dbda835e8fb2d.zip
Remove link installs for tools in drakx-kbd-mouse-x11 (now managed there)
-rw-r--r--perl-install/Makefile.drakxtools4
-rw-r--r--perl-install/NEWS1
2 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index fa5ab4b51..a5a9394e2 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -34,7 +34,6 @@ install:
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)
@@ -75,14 +74,11 @@ 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}
check:
diff --git a/perl-install/NEWS b/perl-install/NEWS
index b98ae0147..20f81670a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- remove symlinks during install that are now handled in drakx-kbd-mouse-x11
- fix drakauth ldap configuration (mga#10005)
- ensure files are installed for nfs (mga#10301)
- stage2: add Feature:Independently_install_desktop_environments