154 files changed, 65 insertions, 89 deletions
diff --git a/Makefile b/Makefile
index 05309e23..19d2c88b 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,12 @@ sharedstatedir = $(localstatedir)/lib
 VERSION       := $(shell gawk '/Version:/ { print $$2 }' initscripts.spec)
 NEXT_VERSION  := $(shell gawk '/Version:/ { print $$2 + 0.01}' initscripts.spec)
 
+Mageia_DIR     := mageia
+Mageia_FILES   := $(shell cd $(Mageia_DIR); find etc network-scripts usr -type f \! -name .keep)
+Mageia_SUBDIRS := $(shell cd $(Mageia_DIR); find -type d -links 2)
+PO             := po-mageia
+Mageia_MANDIR  := man-mageia
+
 
 all: make-binaries make-translations
 
@@ -42,7 +48,7 @@ make-binaries:
 	$(MAKE) -C src
 
 make-translations:
-	$(MAKE) -C po PYTHON=$(PYTHON)
+	$(MAKE) -C $(PO) PYTHON=$(PYTHON)
 
 
 # NOTE: We are no longer installing into /usr/sbin directory, because this is
@@ -51,12 +57,19 @@ make-translations:
 #       compatibility).
 install: install-binaries install-translations install-etc install-usr install-network-scripts install-man install-post
 
+install-mageia:
+	# Ensure the directories used by Mageia exist in the main directory
+	@for i in $(Mageia_SUBDIRS); do mkdir -p $$i; echo "$$i";done
+	# Now copy over the various files to the main directory. This allows
+	# the standard logic of this Makefile to work
+	@for i in $(Mageia_FILES);do cp -a $(Mageia_DIR)/$$i $$i;done
+
 
 install-binaries:
 	$(MAKE) install -C src DESTDIR=$(DESTDIR) prefix=$(prefix) bindir=$(bindir) libdir=$(libdir)
 
 install-translations:
-	$(MAKE) install -C po  DESTDIR=$(DESTDIR) prefix=$(prefix) bindir=$(bindir) libdir=$(libdir) \
+	$(MAKE) install -C $(PO)  DESTDIR=$(DESTDIR) prefix=$(prefix) bindir=$(bindir) libdir=$(libdir) \
 	                                          datarootdir=$(datarootdir) datadir=$(datadir) sysconfdir=$(sysconfdir)
 
 
@@ -80,8 +93,9 @@ install-man: install-usr
 	install -m 0644 man/*.1 $(DESTDIR)$(mandir)/man1
 	install -m 0644 man/*.8 $(DESTDIR)$(mandir)/man8
 	# install translated man pages
-	for j in 1 3 8 ; do \
-	   for i in man/??* ; do \
+	for j in 1 8 ; do \
+	   for i in $(Mageia_MANDIR)/??* ; do \
+	       install -d $(DESTDIR)$(mandir)/`basename $$i`/man$$j ; \
 	       install -m 644 $$i/*.$$j $(DESTDIR)$(mandir)/`basename $$i`/man$$j ; \
 	   done ; \
 	done
@@ -102,11 +116,17 @@ install-post: install-etc
 	done
 	ln -srf $(DESTDIR)$(sysconfdir)/rc.d/init.d $(DESTDIR)$(sysconfdir)/init.d
 
-clean:
+clean: clean-mageia
 	$(MAKE) clean -C src
-	$(MAKE) clean -C po
+	$(MAKE) clean -C $(PO)
 	@find . -name "*~" -exec rm -v -f {} \;
 
+clean-mageia:
+	# Remove the files we've added
+	@for i in $(Mageia_FILES);do rm -f $$i;done
+	# Try to remove any empty directories caused by the files we've removed
+	@for i in $(Mageia_SUBDIRS);do [ -d "$$1" ] && [ ! -h "$$1" ] && rmdir "$$1" 2> /dev/null;done
+
 tag:
 	@git tag -a -f -m "$(VERSION) release" $(VERSION)
 	@echo "Tagged as $(VERSION)"
diff --git a/mageia/etc/X11/xsetup.d/.keep b/mageia/etc/X11/xsetup.d/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mageia/etc/X11/xsetup.d/.keep
diff --git a/mageia/etc/modprobe.preload.d/.keep b/mageia/etc/modprobe.preload.d/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mageia/etc/modprobe.preload.d/.keep
diff --git a/mandriva/modules b/mageia/etc/modules
index 600a93e0..600a93e0 100644
--- a/mandriva/modules
+++ b/mageia/etc/modules
diff --git a/mandriva/inputrc.csh b/mageia/etc/profile.d/10inputrc.csh
index f520f800..f520f800 100644
--- a/mandriva/inputrc.csh
+++ b/mageia/etc/profile.d/10inputrc.csh
diff --git a/mandriva/tmpdir.csh b/mageia/etc/profile.d/10tmpdir.csh
index c0deecab..c0deecab 100644
--- a/mandriva/tmpdir.csh
+++ b/mageia/etc/profile.d/10tmpdir.csh
diff --git a/mandriva/tmpdir.sh b/mageia/etc/profile.d/10tmpdir.sh
index 87d984e8..87d984e8 100644
--- a/mandriva/tmpdir.sh
+++ b/mageia/etc/profile.d/10tmpdir.sh
diff --git a/mandriva/mandrake_everytime b/mageia/etc/rc.d/init.d/mandrake_everytime
index 76ff67e6..76ff67e6 100644
--- a/mandriva/mandrake_everytime
+++ b/mageia/etc/rc.d/init.d/mandrake_everytime
diff --git a/mandriva/mandrake_firstime b/mageia/etc/rc.d/init.d/mandrake_firstime
index e47ca8e0..e47ca8e0 100644
--- a/mandriva/mandrake_firstime
+++ b/mageia/etc/rc.d/init.d/mandrake_firstime
diff --git a/mandriva/network-auth b/mageia/etc/rc.d/init.d/network-auth
index bfbae50d..bfbae50d 100755
--- a/mandriva/network-auth
+++ b/mageia/etc/rc.d/init.d/network-auth
diff --git a/mandriva/network-up b/mageia/etc/rc.d/init.d/network-up
index 7d5360e9..7d5360e9 100755
--- a/mandriva/network-up
+++ b/mageia/etc/rc.d/init.d/network-up
diff --git a/mandriva/partmon/partmon b/mageia/etc/rc.d/init.d/partmon
index 0c893020..0c893020 100644
--- a/mandriva/partmon/partmon
+++ b/mageia/etc/rc.d/init.d/partmon
diff --git a/mandriva/rc.modules b/mageia/etc/rc.modules
index fadc9804..fadc9804 100644
--- a/mandriva/rc.modules
+++ b/mageia/etc/rc.modules
diff --git a/mandriva/autofsck b/mageia/etc/sysconfig/autofsck
index d0291e46..d0291e46 100644
--- a/mandriva/autofsck
+++ b/mageia/etc/sysconfig/autofsck
diff --git a/mandriva/partmon/partmon.sysconfig b/mageia/etc/sysconfig/partmon.sysconfig
index 622e4492..622e4492 100644
--- a/mandriva/partmon/partmon.sysconfig
+++ b/mageia/etc/sysconfig/partmon.sysconfig
diff --git a/mageia/network-scripts/cellular.d/.keep b/mageia/network-scripts/cellular.d/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mageia/network-scripts/cellular.d/.keep
diff --git a/mageia/network-scripts/hostname.d/.keep b/mageia/network-scripts/hostname.d/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mageia/network-scripts/hostname.d/.keep
diff --git a/mandriva/ifdown-hso b/mageia/network-scripts/ifdown-hso
index 0cedb00e..0cedb00e 100755
--- a/mandriva/ifdown-hso
+++ b/mageia/network-scripts/ifdown-hso
diff --git a/mandriva/ifup-hso b/mageia/network-scripts/ifup-hso
index 859e5bf9..859e5bf9 100755
--- a/mandriva/ifup-hso
+++ b/mageia/network-scripts/ifup-hso
diff --git a/mandriva/vpn/vpn-ifdown b/mageia/network-scripts/ifup.d/vpn/vpn-ifdown
index 466e54fd..466e54fd 100755
--- a/mandriva/vpn/vpn-ifdown
+++ b/mageia/network-scripts/ifup.d/vpn/vpn-ifdown
diff --git a/mandriva/vpn/vpn-ifup b/mageia/network-scripts/ifup.d/vpn/vpn-ifup
index 4425d154..4425d154 100755
--- a/mandriva/vpn/vpn-ifup
+++ b/mageia/network-scripts/ifup.d/vpn/vpn-ifup
diff --git a/mageia/network-scripts/wireless.d/.keep b/mageia/network-scripts/wireless.d/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/mageia/network-scripts/wireless.d/.keep
diff --git a/mandriva/partmon/partmon.pl b/mageia/usr/bin/partmon.pl
index d6d297b6..d6d297b6 100644
--- a/mandriva/partmon/partmon.pl
+++ b/mageia/usr/bin/partmon.pl
diff --git a/mandriva/lsb-init-functions b/mageia/usr/lib/lsb/lsb-init-functions
index 4e11f32e..4e11f32e 100644
--- a/mandriva/lsb-init-functions
+++ b/mageia/usr/lib/lsb/lsb-init-functions
diff --git a/mandriva/hibernate-cleanup.sh b/mageia/usr/sbin/hibernate-cleanup.sh
index 49451859..49451859 100755
--- a/mandriva/hibernate-cleanup.sh
+++ b/mageia/usr/sbin/hibernate-cleanup.sh
diff --git a/mandriva/listhome b/mageia/usr/sbin/listhome
index 733dbe08..733dbe08 100644
--- a/mandriva/listhome
+++ b/mageia/usr/sbin/listhome
diff --git a/mandriva/mdv-network-event b/mageia/usr/sbin/mdv-network-event
index 705361b7..705361b7 100755
--- a/mandriva/mdv-network-event
+++ b/mageia/usr/sbin/mdv-network-event
diff --git a/mandriva/vpn/vpn-start b/mageia/usr/sbin/vpn-start
index 49a02cf1..49a02cf1 100755
--- a/mandriva/vpn/vpn-start
+++ b/mageia/usr/sbin/vpn-start
diff --git a/mandriva/vpn/vpn-stop b/mageia/usr/sbin/vpn-stop
index 048c909f..048c909f 100755
--- a/mandriva/vpn/vpn-stop
+++ b/mageia/usr/sbin/vpn-stop
diff --git a/man/cs/consoletype.1 b/man-mageia/cs/consoletype.1
index 7ef8d9f1..7ef8d9f1 100644
--- a/man/cs/consoletype.1
+++ b/man-mageia/cs/consoletype.1
diff --git a/man/cs/detectloader.8 b/man-mageia/cs/detectloader.8
index 3ac7a424..3ac7a424 100644
--- a/man/cs/detectloader.8
+++ b/man-mageia/cs/detectloader.8
diff --git a/man/cs/ipcalc.1 b/man-mageia/cs/ipcalc.1
index 84e1e39c..84e1e39c 100644
--- a/man/cs/ipcalc.1
+++ b/man-mageia/cs/ipcalc.1
diff --git a/man/cs/netreport.1 b/man-mageia/cs/netreport.1
index 60f5b14a..60f5b14a 100644
--- a/man/cs/netreport.1
+++ b/man-mageia/cs/netreport.1
diff --git a/man/cs/ppp-watch.8 b/man-mageia/cs/ppp-watch.8
index 3e6921ba..3e6921ba 100644
--- a/man/cs/ppp-watch.8
+++ b/man-mageia/cs/ppp-watch.8
diff --git a/man/cs/sys-unconfig.8 b/man-mageia/cs/sys-unconfig.8
index 4a1d81ac..4a1d81ac 100644
--- a/man/cs/sys-unconfig.8
+++ b/man-mageia/cs/sys-unconfig.8
diff --git a/man/cs/usernetctl.8 b/man-mageia/cs/usernetctl.8
index 27da0a36..27da0a36 100644
--- a/man/cs/usernetctl.8
+++ b/man-mageia/cs/usernetctl.8
diff --git a/man/cs/usleep.1 b/man-mageia/cs/usleep.1
index cd063733..cd063733 100644
--- a/man/cs/usleep.1
+++ b/man-mageia/cs/usleep.1
diff --git a/man/et/consoletype.1 b/man-mageia/et/consoletype.1
index 5e2ef724..5e2ef724 100644
--- a/man/et/consoletype.1
+++ b/man-mageia/et/consoletype.1
diff --git a/man/et/detectloader.8 b/man-mageia/et/detectloader.8
index b3968c1b..b3968c1b 100644
--- a/man/et/detectloader.8
+++ b/man-mageia/et/detectloader.8
diff --git a/man/et/ipcalc.1 b/man-mageia/et/ipcalc.1
index 968baa66..968baa66 100644
--- a/man/et/ipcalc.1
+++ b/man-mageia/et/ipcalc.1
diff --git a/man/et/netreport.1 b/man-mageia/et/netreport.1
index 993cb5a2..993cb5a2 100644
--- a/man/et/netreport.1
+++ b/man-mageia/et/netreport.1
diff --git a/man/et/ppp-watch.8 b/man-mageia/et/ppp-watch.8
index 7cc6feb1..7cc6feb1 100644
--- a/man/et/ppp-watch.8
+++ b/man-mageia/et/ppp-watch.8
diff --git a/man/et/sys-unconfig.8 b/man-mageia/et/sys-unconfig.8
index ef5dd6eb..ef5dd6eb 100644
--- a/man/et/sys-unconfig.8
+++ b/man-mageia/et/sys-unconfig.8
diff --git a/man/et/usernetctl.8 b/man-mageia/et/usernetctl.8
index 721a497c..721a497c 100644
--- a/man/et/usernetctl.8
+++ b/man-mageia/et/usernetctl.8
diff --git a/man/et/usleep.1 b/man-mageia/et/usleep.1
index 1df0f263..1df0f263 100644
--- a/man/et/usleep.1
+++ b/man-mageia/et/usleep.1
diff --git a/man/fr/consoletype.1 b/man-mageia/fr/consoletype.1
index a3c3e501..a3c3e501 100644
--- a/man/fr/consoletype.1
+++ b/man-mageia/fr/consoletype.1
diff --git a/man/fr/detectloader.8 b/man-mageia/fr/detectloader.8
index 84b224e2..84b224e2 100644
--- a/man/fr/detectloader.8
+++ b/man-mageia/fr/detectloader.8
diff --git a/man/fr/ipcalc.1 b/man-mageia/fr/ipcalc.1
index 99c1b5a5..99c1b5a5 100644
--- a/man/fr/ipcalc.1
+++ b/man-mageia/fr/ipcalc.1
diff --git a/man/fr/netreport.1 b/man-mageia/fr/netreport.1
index 8e587141..8e587141 100644
--- a/man/fr/netreport.1
+++ b/man-mageia/fr/netreport.1
diff --git a/man/fr/ppp-watch.8 b/man-mageia/fr/ppp-watch.8
index b52b7de2..b52b7de2 100644
--- a/man/fr/ppp-watch.8
+++ b/man-mageia/fr/ppp-watch.8
diff --git a/man/fr/sys-unconfig.8 b/man-mageia/fr/sys-unconfig.8
index 35eff877..35eff877 100644
--- a/man/fr/sys-unconfig.8
+++ b/man-mageia/fr/sys-unconfig.8
diff --git a/man/fr/usernetctl.8 b/man-mageia/fr/usernetctl.8
index 20d5fb88..20d5fb88 100644
--- a/man/fr/usernetctl.8
+++ b/man-mageia/fr/usernetctl.8
diff --git a/man/fr/usleep.1 b/man-mageia/fr/usleep.1
index df04142a..df04142a 100644
--- a/man/fr/usleep.1
+++ b/man-mageia/fr/usleep.1
diff --git a/man/it/consoletype.1 b/man-mageia/it/consoletype.1
index c5137b94..c5137b94 100644
--- a/man/it/consoletype.1
+++ b/man-mageia/it/consoletype.1
diff --git a/man/it/detectloader.8 b/man-mageia/it/detectloader.8
index 1fba031d..1fba031d 100644
--- a/man/it/detectloader.8
+++ b/man-mageia/it/detectloader.8
diff --git a/man/it/ipcalc.1 b/man-mageia/it/ipcalc.1
index a392925b..a392925b 100644
--- a/man/it/ipcalc.1
+++ b/man-mageia/it/ipcalc.1
diff --git a/man/it/netreport.1 b/man-mageia/it/netreport.1
index 6a365ce2..6a365ce2 100644
--- a/man/it/netreport.1
+++ b/man-mageia/it/netreport.1
diff --git a/man/it/ppp-watch.8 b/man-mageia/it/ppp-watch.8
index 838e3da6..838e3da6 100644
--- a/man/it/ppp-watch.8
+++ b/man-mageia/it/ppp-watch.8
diff --git a/man/it/sys-unconfig.8 b/man-mageia/it/sys-unconfig.8
index 202239a2..202239a2 100644
--- a/man/it/sys-unconfig.8
+++ b/man-mageia/it/sys-unconfig.8
diff --git a/man/it/usernetctl.8 b/man-mageia/it/usernetctl.8
index fa922824..fa922824 100644
--- a/man/it/usernetctl.8
+++ b/man-mageia/it/usernetctl.8
diff --git a/man/it/usleep.1 b/man-mageia/it/usleep.1
index ac87c2d7..ac87c2d7 100644
--- a/man/it/usleep.1
+++ b/man-mageia/it/usleep.1
diff --git a/man/pt_BR/consoletype.1 b/man-mageia/pt_BR/consoletype.1
index e1461e23..e1461e23 100644
--- a/man/pt_BR/consoletype.1
+++ b/man-mageia/pt_BR/consoletype.1
diff --git a/man/pt_BR/detectloader.8 b/man-mageia/pt_BR/detectloader.8
index 098612ea..098612ea 100644
--- a/man/pt_BR/detectloader.8
+++ b/man-mageia/pt_BR/detectloader.8
diff --git a/man/pt_BR/ipcalc.1 b/man-mageia/pt_BR/ipcalc.1
index 846a87b9..846a87b9 100644
--- a/man/pt_BR/ipcalc.1
+++ b/man-mageia/pt_BR/ipcalc.1
diff --git a/man/ru/consoletype.1 b/man-mageia/ru/consoletype.1
index b471df77..b471df77 100644
--- a/man/ru/consoletype.1
+++ b/man-mageia/ru/consoletype.1
diff --git a/man/ru/detectloader.8 b/man-mageia/ru/detectloader.8
index c6328ddb..c6328ddb 100644
--- a/man/ru/detectloader.8
+++ b/man-mageia/ru/detectloader.8
diff --git a/man/ru/ipcalc.1 b/man-mageia/ru/ipcalc.1
index dde39f65..dde39f65 100644
--- a/man/ru/ipcalc.1
+++ b/man-mageia/ru/ipcalc.1
diff --git a/man/ru/netreport.1 b/man-mageia/ru/netreport.1
index 048e06d2..048e06d2 100644
--- a/man/ru/netreport.1
+++ b/man-mageia/ru/netreport.1
diff --git a/man/ru/ppp-watch.8 b/man-mageia/ru/ppp-watch.8
index b2d9bc70..b2d9bc70 100644
--- a/man/ru/ppp-watch.8
+++ b/man-mageia/ru/ppp-watch.8
diff --git a/man/ru/sys-unconfig.8 b/man-mageia/ru/sys-unconfig.8
index ba6827ce..ba6827ce 100644
--- a/man/ru/sys-unconfig.8
+++ b/man-mageia/ru/sys-unconfig.8
diff --git a/man/ru/usernetctl.8 b/man-mageia/ru/usernetctl.8
index 3bb47a1a..3bb47a1a 100644
--- a/man/ru/usernetctl.8
+++ b/man-mageia/ru/usernetctl.8
diff --git a/man/ru/usleep.1 b/man-mageia/ru/usleep.1
index 13f5c0c9..13f5c0c9 100644
--- a/man/ru/usleep.1
+++ b/man-mageia/ru/usleep.1
diff --git a/man/uk/consoletype.1 b/man-mageia/uk/consoletype.1
index 73a861c8..73a861c8 100644
--- a/man/uk/consoletype.1
+++ b/man-mageia/uk/consoletype.1
diff --git a/man/uk/detectloader.8 b/man-mageia/uk/detectloader.8
index 178af67c..178af67c 100644
--- a/man/uk/detectloader.8
+++ b/man-mageia/uk/detectloader.8
diff --git a/man/uk/ipcalc.1 b/man-mageia/uk/ipcalc.1
index 0fbd8526..0fbd8526 100644
--- a/man/uk/ipcalc.1
+++ b/man-mageia/uk/ipcalc.1
diff --git a/man/uk/netreport.1 b/man-mageia/uk/netreport.1
index dff67fbe..dff67fbe 100644
--- a/man/uk/netreport.1
+++ b/man-mageia/uk/netreport.1
diff --git a/man/uk/ppp-watch.8 b/man-mageia/uk/ppp-watch.8
index 0cc39684..0cc39684 100644
--- a/man/uk/ppp-watch.8
+++ b/man-mageia/uk/ppp-watch.8
diff --git a/man/uk/sys-unconfig.8 b/man-mageia/uk/sys-unconfig.8
index e634a804..e634a804 100644
--- a/man/uk/sys-unconfig.8
+++ b/man-mageia/uk/sys-unconfig.8
diff --git a/man/uk/usernetctl.8 b/man-mageia/uk/usernetctl.8
index fcc36bd2..fcc36bd2 100644
--- a/man/uk/usernetctl.8
+++ b/man-mageia/uk/usernetctl.8
diff --git a/man/uk/usleep.1 b/man-mageia/uk/usleep.1
index 529ec99a..529ec99a 100644
--- a/man/uk/usleep.1
+++ b/man-mageia/uk/usleep.1
diff --git a/mandriva/Makefile b/mandriva/Makefile
deleted file mode 100644
index 85dd7533..00000000
--- a/mandriva/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-NAME=initscripts
-CFLAGS=-g -O2 -Wall
-ROOT=/
-SH := $(shell echo *.sh) listhome $(shell echo mandrake_*) rc.modules mdv-network-event network-up
-mandir=/usr/share
-VERSION:=$(shell rpm -q --qf '%{VERSION}\n' --specfile ../$(NAME).spec | head -n 1)
-RELEASE:=$(shell rpm -q --qf '%{RELEASE}\n' --specfile ../$(NAME).spec | head -n 1)
-RH_TAG:=rh$(subst .,_,$(VERSION))
-
-SUBDIRS = partmon vpn
-PROFILE_LEVEL=10
-
-
-all:
-
-check:
-	@for i in $(SH);do /bin/bash -n $$i || exit 1;echo $$i syntax OK;done
-	@for i in $(SUBDIRS);do	make -C $$i check;done
-
-clean:
-
-install: all check
-	mkdir -p $(ROOT)/usr/{bin/,sbin/,man/man8}
-	mkdir -p $(ROOT)/usr/sbin
-	mkdir -p $(ROOT)/etc/modprobe.preload.d/
-	mkdir -p $(ROOT)/etc/rc.d/init.d/
-	mkdir -p $(ROOT)/usr/lib/lsb
-	mkdir -p $(ROOT)/etc/profile.d/
-	mkdir -p $(ROOT)/etc/ppp/ip-{up,down}.d/
-	mkdir -p $(ROOT)/etc/sysconfig/network-scripts/if{up,down}.d
-	mkdir -p $(ROOT)/etc/sysconfig/network-scripts/cellular.d
-	mkdir -p $(ROOT)/etc/sysconfig/network-scripts/hostname.d
-	mkdir -p $(ROOT)/etc/sysconfig/network-scripts/wireless.d
-	mkdir -p $(ROOT)/etc/X11/xsetup.d
-	install -m755 if{up,down}-hso $(ROOT)/etc/sysconfig/network-scripts/
-	install -m755 rc.modules $(ROOT)/etc/
-	install -m644 modules $(ROOT)/etc/
-	for profile in {inputrc,tmpdir}.{c,}sh; do \
-	  install -m644 $$profile $(ROOT)/etc/profile.d/$(PROFILE_LEVEL)$$profile; \
-	done
-	install -m755 listhome $(ROOT)/usr/bin/
-	install -m755 mandrake_{firstime,everytime} network-auth network-up $(ROOT)/etc/rc.d/init.d/
-	install -D -m644 autofsck $(ROOT)/etc/sysconfig/autofsck
-	@for i in $(SUBDIRS);do	make -C $$i install;done
-
-	install -m755 hibernate-cleanup.sh $(ROOT)/usr/sbin/
-	install -m755 lsb-init-functions $(ROOT)/usr/lib/lsb/init-functions
-	install -m755 mdv-network-event $(ROOT)/usr/sbin/
-
diff --git a/mandriva/partmon/Makefile b/mandriva/partmon/Makefile
deleted file mode 100644
index 7aaa5489..00000000
--- a/mandriva/partmon/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-SH=partmon
-PL=partmon.pl
-
-all: check
-
-check:
-	@for i in $(SH);do /bin/bash -n $$i || exit 1;echo $$i syntax OK;done
-	@for i in $(PL);do perl -wc $$i || exit 1;done
-
-install:
-	mkdir -p $(ROOT)/usr/bin $(ROOT)/etc/rc.d/init.d
-	install -D -m755 partmon $(ROOT)/etc/rc.d/init.d/partmon
-	install -D -m755 partmon.pl $(ROOT)/usr/bin/partmon
-	install -D -m644 partmon.sysconfig $(ROOT)/etc/sysconfig/partmon
diff --git a/mandriva/vpn/Makefile b/mandriva/vpn/Makefile
deleted file mode 100644
index 540414c4..00000000
--- a/mandriva/vpn/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-SH=vpn-start vpn-stop vpn-ifup vpn-ifdown
-PL=partmon.pl
-
-all: check
-
-check:
-	@for i in $(SH);do /bin/bash -n $$i || exit 1;echo $$i syntax OK;done
-
-install:
-	mkdir -p $(ROOT)/etc/sysconfig/network-scripts/vpn.d/{openvpn,pptp,vpnc}
-	install -m755 vpn-start $(ROOT)/usr/sbin/
-	install -m755 vpn-stop $(ROOT)/usr/sbin/	
-	install -m755 vpn-ifup $(ROOT)/etc/sysconfig/network-scripts/ifup.d/vpn
-	install -m755 vpn-ifdown $(ROOT)/etc/sysconfig/network-scripts/ifdown.d/vpn
diff --git a/mandriva/po/EXTRA_STRINGS b/po-mageia/EXTRA_STRINGS
index 2d2843cd..2d2843cd 100644
--- a/mandriva/po/EXTRA_STRINGS
+++ b/po-mageia/EXTRA_STRINGS
diff --git a/mandriva/po/Makefile b/po-mageia/Makefile
index f7341a9b..01f6540f 100644
--- a/mandriva/po/Makefile
+++ b/po-mageia/Makefile
@@ -1,7 +1,40 @@
+# Basic Makefile for compiling & installing the files.
+#
+# Supports standard GNU Makefile variables for specifying the paths:
+# * prefix
+# * exec_prefix
+# * bindir
+# * sbindir
+# * libdir
+# * datarootdir
+# * datadir
+# * mandir
+# * sysconfdir
+# * localstatedir
+# * DESTDIR
+#
+
+SHELL          = /bin/bash
+
+# Normally /usr/local is used. However, it does not make sense for us to use it
+# here, as it just complicates things even further.
+prefix         = /usr
+exec_prefix    = $(prefix)
+bindir         = $(prefix)/bin
+sbindir        = $(prefix)/sbin
+libdir         = $(prefix)/lib
+libexecdir     = $(exec_prefix)/libexec
+datarootdir    = $(prefix)/share
+datadir        = $(datarootdir)
+mandir         = $(datadir)/man
+sysconfdir     = /etc
+localstatedir  = /var
+sharedstatedir = $(localstatedir)/lib
+INSTALLNLSDIR  = $(prefix)/share/locale
+
 INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
-INSTALLNLSDIR=/usr/share/locale
 RPMROOT=/mnt/BIG/dis/cooker/i586/media
 
 MSGMERGE = msgmerge
@@ -25,7 +58,7 @@ pot $(NLSPACKAGE).pot: POTFILES
 	mkdir -p etc/rc.d etc/sysconfig/network-scripts
 	cp ../../sysconfig/network-scripts/* etc/sysconfig/network-scripts/
 	cp ../../rc.d/rc*  etc/rc.d/
-	../gprintify.py etc/rc.d/rc* etc/sysconfig/network-scripts/* etc/rc.d/init.d/*
+	./gprintify.py etc/rc.d/rc* etc/sysconfig/network-scripts/* etc/rc.d/init.d/*
 	./xgettext_sh.py `find etc -type f` > $(NLSPACKAGE).po
 	sed -i -e '/^#:/s|etc/|/etc/|g' -e "s/=CHARSET/=utf-8/" $(NLSPACKAGE).po
 	msgattrib -F $(NLSPACKAGE).po -o $(NLSPACKAGE).po
@@ -61,14 +94,14 @@ distclean: clean
 depend:
 
 install:	all
-	mkdir -p $(PREFIX)/$(INSTALLNLSDIR)
+	mkdir -p $(DESTDIR)$(INSTALLNLSDIR)
 	for n in $(CATALOGS); do \
 	    l=`basename $$n .po`; \
 	    mo=$$l.mo; \
-	    $(INSTALL) -m 755 -d $(PREFIX)/$(INSTALLNLSDIR)/$$l; \
-	    $(INSTALL) -m 755 -d $(PREFIX)/$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
+	    $(INSTALL) -m 755 -d $(DESTDIR)$(INSTALLNLSDIR)/$$l; \
+	    $(INSTALL) -m 755 -d $(DESTDIR)$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
 	    $(INSTALL) -m 644 $$mo \
-		$(PREFIX)/$(INSTALLNLSDIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \
+		$(DESTDIR)$(INSTALLNLSDIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \
 	done
 
 %.mo: %.po
diff --git a/mandriva/po/README.i18n b/po-mageia/README.i18n
index 2a7b17af..2a7b17af 100644
--- a/mandriva/po/README.i18n
+++ b/po-mageia/README.i18n
diff --git a/mandriva/po/af.po b/po-mageia/af.po
index 32861b6f..32861b6f 100644
--- a/mandriva/po/af.po
+++ b/po-mageia/af.po
diff --git a/mandriva/po/ar.po b/po-mageia/ar.po
index 502df6bf..502df6bf 100644
--- a/mandriva/po/ar.po
+++ b/po-mageia/ar.po
diff --git a/mandriva/po/az.po b/po-mageia/az.po
index b8c65740..b8c65740 100644
--- a/mandriva/po/az.po
+++ b/po-mageia/az.po
diff --git a/mandriva/po/bg.po b/po-mageia/bg.po
index 3ec641e6..3ec641e6 100644
--- a/mandriva/po/bg.po
+++ b/po-mageia/bg.po
diff --git a/mandriva/po/bn.po b/po-mageia/bn.po
index 148c7eb8..148c7eb8 100644
--- a/mandriva/po/bn.po
+++ b/po-mageia/bn.po
diff --git a/mandriva/po/br.po b/po-mageia/br.po
index f973c108..f973c108 100644
--- a/mandriva/po/br.po
+++ b/po-mageia/br.po
diff --git a/mandriva/po/bs.po b/po-mageia/bs.po
index 6250c9b0..6250c9b0 100644
--- a/mandriva/po/bs.po
+++ b/po-mageia/bs.po
diff --git a/mandriva/po/ca.po b/po-mageia/ca.po
index dab16f16..dab16f16 100644
--- a/mandriva/po/ca.po
+++ b/po-mageia/ca.po
diff --git a/mandriva/po/cs.po b/po-mageia/cs.po
index b672d2a2..b672d2a2 100644
--- a/mandriva/po/cs.po
+++ b/po-mageia/cs.po
diff --git a/mandriva/po/cy.po b/po-mageia/cy.po
index 8fb9bcb8..8fb9bcb8 100644
--- a/mandriva/po/cy.po
+++ b/po-mageia/cy.po
diff --git a/mandriva/po/da.po b/po-mageia/da.po
index 6d4ab19a..6d4ab19a 100644
--- a/mandriva/po/da.po
+++ b/po-mageia/da.po
diff --git a/mandriva/po/de.po b/po-mageia/de.po
index 02561026..02561026 100644
--- a/mandriva/po/de.po
+++ b/po-mageia/de.po
diff --git a/mandriva/po/el.po b/po-mageia/el.po
index 8c8e5e36..8c8e5e36 100644
--- a/mandriva/po/el.po
+++ b/po-mageia/el.po
diff --git a/mandriva/po/en_GB.po b/po-mageia/en_GB.po
index 713f5860..713f5860 100644
--- a/mandriva/po/en_GB.po
+++ b/po-mageia/en_GB.po
diff --git a/mandriva/po/eo.po b/po-mageia/eo.po
index 19851367..19851367 100644
--- a/mandriva/po/eo.po
+++ b/po-mageia/eo.po
diff --git a/mandriva/po/es.po b/po-mageia/es.po
index 95d3c2eb..95d3c2eb 100644
--- a/mandriva/po/es.po
+++ b/po-mageia/es.po
diff --git a/mandriva/po/et.po b/po-mageia/et.po
index 2bfd62b9..2bfd62b9 100644
--- a/mandriva/po/et.po
+++ b/po-mageia/et.po
diff --git a/mandriva/po/eu.po b/po-mageia/eu.po
index 61edb847..61edb847 100644
--- a/mandriva/po/eu.po
+++ b/po-mageia/eu.po
diff --git a/mandriva/po/fa.po b/po-mageia/fa.po
index af259ee3..af259ee3 100644
--- a/mandriva/po/fa.po
+++ b/po-mageia/fa.po
diff --git a/mandriva/po/fi.po b/po-mageia/fi.po
index ce250383..ce250383 100644
--- a/mandriva/po/fi.po
+++ b/po-mageia/fi.po
diff --git a/mandriva/po/fr.po b/po-mageia/fr.po
index 7e742b48..7e742b48 100644
--- a/mandriva/po/fr.po
+++ b/po-mageia/fr.po
diff --git a/mandriva/po/fur.po b/po-mageia/fur.po
index 9673a984..9673a984 100644
--- a/mandriva/po/fur.po
+++ b/po-mageia/fur.po
diff --git a/mandriva/po/ga.po b/po-mageia/ga.po
index a81e058a..a81e058a 100644
--- a/mandriva/po/ga.po
+++ b/po-mageia/ga.po
diff --git a/mandriva/po/gl.po b/po-mageia/gl.po
index 8fdd9daa..8fdd9daa 100644
--- a/mandriva/po/gl.po
+++ b/po-mageia/gl.po
diff --git a/mandriva/gprintify.py b/po-mageia/gprintify.py
index 1edecb48..1edecb48 100755
--- a/mandriva/gprintify.py
+++ b/po-mageia/gprintify.py
diff --git a/mandriva/po/he.po b/po-mageia/he.po
index c0da595c..c0da595c 100644
--- a/mandriva/po/he.po
+++ b/po-mageia/he.po
diff --git a/mandriva/po/hi.po b/po-mageia/hi.po
index 4ef5e098..4ef5e098 100644
--- a/mandriva/po/hi.po
+++ b/po-mageia/hi.po
diff --git a/mandriva/po/hr.po b/po-mageia/hr.po
index 43fd8521..43fd8521 100644
--- a/mandriva/po/hr.po
+++ b/po-mageia/hr.po
diff --git a/mandriva/po/hu.po b/po-mageia/hu.po
index 41d66ea9..41d66ea9 100644
--- a/mandriva/po/hu.po
+++ b/po-mageia/hu.po
diff --git a/mandriva/po/id.po b/po-mageia/id.po
index eea6cba1..eea6cba1 100644
--- a/mandriva/po/id.po
+++ b/po-mageia/id.po
diff --git a/mandriva/po/initscripts.pot b/po-mageia/initscripts.pot
index 1b89be71..1b89be71 100644
--- a/mandriva/po/initscripts.pot
+++ b/po-mageia/initscripts.pot
diff --git a/mandriva/po/is.po b/po-mageia/is.po
index 435eeb16..435eeb16 100644
--- a/mandriva/po/is.po
+++ b/po-mageia/is.po
diff --git a/mandriva/po/it.po b/po-mageia/it.po
index babdb435..babdb435 100644
--- a/mandriva/po/it.po
+++ b/po-mageia/it.po
diff --git a/mandriva/po/ja.po b/po-mageia/ja.po
index 344d0b1d..344d0b1d 100644
--- a/mandriva/po/ja.po
+++ b/po-mageia/ja.po
diff --git a/mandriva/po/ko.po b/po-mageia/ko.po
index a70b3a3d..a70b3a3d 100644
--- a/mandriva/po/ko.po
+++ b/po-mageia/ko.po
diff --git a/mandriva/po/ku.po b/po-mageia/ku.po
index ca6ff227..ca6ff227 100644
--- a/mandriva/po/ku.po
+++ b/po-mageia/ku.po
diff --git a/mandriva/po/ky.po b/po-mageia/ky.po
index 818b8355..818b8355 100644
--- a/mandriva/po/ky.po
+++ b/po-mageia/ky.po
diff --git a/mandriva/po/lt.po b/po-mageia/lt.po
index d8eec6eb..d8eec6eb 100644
--- a/mandriva/po/lt.po
+++ b/po-mageia/lt.po
diff --git a/mandriva/po/lv.po b/po-mageia/lv.po
index 2be410dc..2be410dc 100644
--- a/mandriva/po/lv.po
+++ b/po-mageia/lv.po
diff --git a/mandriva/po/ms.po b/po-mageia/ms.po
index c73cda25..c73cda25 100644
--- a/mandriva/po/ms.po
+++ b/po-mageia/ms.po
diff --git a/mandriva/po/mt.po b/po-mageia/mt.po
index bce2214c..bce2214c 100644
--- a/mandriva/po/mt.po
+++ b/po-mageia/mt.po
diff --git a/mandriva/po/nb.po b/po-mageia/nb.po
index 3078e23f..3078e23f 100644
--- a/mandriva/po/nb.po
+++ b/po-mageia/nb.po
diff --git a/mandriva/po/nn.po b/po-mageia/nn.po
index ab52596b..ab52596b 100644
--- a/mandriva/po/nn.po
+++ b/po-mageia/nn.po
diff --git a/mandriva/po/or.po b/po-mageia/or.po
index 62b63d92..62b63d92 100644
--- a/mandriva/po/or.po
+++ b/po-mageia/or.po
diff --git a/mandriva/po/pa_IN.po b/po-mageia/pa_IN.po
index c2e5bf24..c2e5bf24 100644
--- a/mandriva/po/pa_IN.po
+++ b/po-mageia/pa_IN.po
diff --git a/mandriva/po/pl.po b/po-mageia/pl.po
index 24ed9722..24ed9722 100644
--- a/mandriva/po/pl.po
+++ b/po-mageia/pl.po
diff --git a/mandriva/po/pt.po b/po-mageia/pt.po
index 50b602cf..50b602cf 100644
--- a/mandriva/po/pt.po
+++ b/po-mageia/pt.po
diff --git a/mandriva/po/pt_BR.po b/po-mageia/pt_BR.po
index 53695b19..53695b19 100644
--- a/mandriva/po/pt_BR.po
+++ b/po-mageia/pt_BR.po
diff --git a/mandriva/po/ro.po b/po-mageia/ro.po
index b76de897..b76de897 100644
--- a/mandriva/po/ro.po
+++ b/po-mageia/ro.po
diff --git a/mandriva/po/ru.po b/po-mageia/ru.po
index 3824c9fd..3824c9fd 100644
--- a/mandriva/po/ru.po
+++ b/po-mageia/ru.po
diff --git a/mandriva/po/sc.po b/po-mageia/sc.po
index 53dc232c..53dc232c 100644
--- a/mandriva/po/sc.po
+++ b/po-mageia/sc.po
diff --git a/mandriva/po/sk.po b/po-mageia/sk.po
index 371fecd2..371fecd2 100644
--- a/mandriva/po/sk.po
+++ b/po-mageia/sk.po
diff --git a/mandriva/po/sl.po b/po-mageia/sl.po
index 4ac13fcc..4ac13fcc 100644
--- a/mandriva/po/sl.po
+++ b/po-mageia/sl.po
diff --git a/mandriva/po/sq.po b/po-mageia/sq.po
index 2afd18b3..2afd18b3 100644
--- a/mandriva/po/sq.po
+++ b/po-mageia/sq.po
diff --git a/mandriva/po/sr.po b/po-mageia/sr.po
index 5bde74d4..5bde74d4 100644
--- a/mandriva/po/sr.po
+++ b/po-mageia/sr.po
diff --git a/mandriva/po/sr@Latn.po b/po-mageia/sr@Latn.po
index 59c76e86..59c76e86 100644
--- a/mandriva/po/sr@Latn.po
+++ b/po-mageia/sr@Latn.po
diff --git a/mandriva/po/sv.po b/po-mageia/sv.po
index 6433738a..6433738a 100644
--- a/mandriva/po/sv.po
+++ b/po-mageia/sv.po
diff --git a/mandriva/po/tg.po b/po-mageia/tg.po
index e284c273..e284c273 100644
--- a/mandriva/po/tg.po
+++ b/po-mageia/tg.po
diff --git a/mandriva/po/tl.po b/po-mageia/tl.po
index 49d95178..49d95178 100644
--- a/mandriva/po/tl.po
+++ b/po-mageia/tl.po
diff --git a/mandriva/po/tr.po b/po-mageia/tr.po
index fc42e198..fc42e198 100644
--- a/mandriva/po/tr.po
+++ b/po-mageia/tr.po
diff --git a/mandriva/po/uk.po b/po-mageia/uk.po
index 0fd4b80e..0fd4b80e 100644
--- a/mandriva/po/uk.po
+++ b/po-mageia/uk.po
diff --git a/mandriva/po/uz.po b/po-mageia/uz.po
index c3e158d9..c3e158d9 100644
--- a/mandriva/po/uz.po
+++ b/po-mageia/uz.po
diff --git a/mandriva/po/uz@cyrillic.po b/po-mageia/uz@cyrillic.po
index e7de7a99..e7de7a99 100644
--- a/mandriva/po/uz@cyrillic.po
+++ b/po-mageia/uz@cyrillic.po
diff --git a/mandriva/po/vi.po b/po-mageia/vi.po
index 520bae98..520bae98 100644
--- a/mandriva/po/vi.po
+++ b/po-mageia/vi.po
diff --git a/mandriva/po/wa.po b/po-mageia/wa.po
index 80144113..80144113 100644
--- a/mandriva/po/wa.po
+++ b/po-mageia/wa.po
diff --git a/mandriva/po/xgettext_sh.py b/po-mageia/xgettext_sh.py
index d23d6b10..d23d6b10 100755
--- a/mandriva/po/xgettext_sh.py
+++ b/po-mageia/xgettext_sh.py
diff --git a/mandriva/po/zh_CN.po b/po-mageia/zh_CN.po
index 4bd9d7ed..4bd9d7ed 100644
--- a/mandriva/po/zh_CN.po
+++ b/po-mageia/zh_CN.po
diff --git a/mandriva/po/zh_TW.po b/po-mageia/zh_TW.po
index 97196313..97196313 100644
--- a/mandriva/po/zh_TW.po
+++ b/po-mageia/zh_TW.po