From 1996beae8aba2a08a4a23020a59c958737d88a92 Mon Sep 17 00:00:00 2001
From: David Baudens <baudens@mandriva.com>
Date: Thu, 13 Sep 2001 13:52:12 +0000
Subject: *** empty log message ***

---
 Makefile           |  4 ++--
 mandrake_desk.spec | 14 +++-----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 42ddcfe..7b06062 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ install:
 	mkdir -p $(RPM_BUILD_ROOT)/usr/{s,}bin
 	mkdir -p $(RPM_BUILD_ROOT)/$(mandir)/man8/
 	mkdir -p $(RPM_BUILD_ROOT)/usr/lib/mc/
-	mkdir -p $(RPM_BUILD_ROOT)/usr/share/{faces,icons,icons/large,icons/mini,pixmaps/backgrounds/linux-mandrake}
+	mkdir -p $(RPM_BUILD_ROOT)/usr/share/{mdk/faces,icons,icons/large,icons/mini,pixmaps/backgrounds/linux-mandrake}
 	mkdir -p $(RPM_BUILD_ROOT)/etc/X11/
 	mkdir -p $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk
 	mkdir -p $(RPM_BUILD_ROOT)/etc/skel/Desktop
@@ -38,7 +38,7 @@ install:
 
 	install -m644 icons/mandrake*.xpm $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk/
 
-	install -m644 faces/* $(RPM_BUILD_ROOT)/usr/share/faces
+	install -m644 faces/* $(RPM_BUILD_ROOT)/usr/share/mdk/faces
 
 	mkdir -p $(RPM_BUILD_ROOT)/usr/lib/mc/desktop-scripts
 	cp gnome/mandrake.links.sh $(RPM_BUILD_ROOT)/usr/lib/mc/desktop-scripts/mandrake.links.sh
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 4ecaa66..932040a 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -101,13 +101,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/X11/wmsession.d/
 
 rm -f special/mandrake-small.xpm
 
-cd $RPM_BUILD_ROOT%_datadir/faces
-mkdir -p $RPM_BUILD_ROOT%_datadir/mdk/faces
-mv * $RPM_BUILD_ROOT%_datadir/mdk/faces
-cp $RPM_BUILD_ROOT%_datadir/mdk/faces/user-hat-mdk.png root.png
-cp root.png root
-cp $RPM_BUILD_ROOT%_datadir/mdk/faces/man.png default.png
-cd -
+cp %buildroot/%_datadir/mdk/faces/user-hat-mdk.png %buildroot/%_datadir/faces/root.png
+cp %buildroot/%_datadir/faces/root.png %buildroot/%_datadir/faces/root
+cp %buildroot/%_datadir/mdk/faces/man.png default.png
 
 cd $RPM_BUILD_ROOT%_datadir/pixmaps/backgrounds/linux-mandrake
 ln -s ICE-640.png PP5-640.png
@@ -200,10 +196,6 @@ rm -rf $RPM_BUILD_ROOT
 %_sbindir/*
 #
 #
-%dir %_datadir/faces/
-%_datadir/faces/*
-#
-#
 %_iconsdir/*.xpm
 %_iconsdir/*.png
 %_miconsdir/*
-- 
cgit v1.2.1