From 158e1c91616e3c5d10ae58ae26b7cdc360ad5ce2 Mon Sep 17 00:00:00 2001
From: mharris <mharris>
Date: Sat, 12 Nov 2005 02:46:20 +0000
Subject: [PATCH] fix manpage install hack

---
 xorg-x11-server.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 7d43d91..6e4edc2 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -191,7 +191,9 @@ drivers, input drivers, or other X modules should install this package.
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
 	--disable-xorgcfg
 
-make %{?_smp_mflags}
+make
+# FIXME: disable smp_mflags on the above make, to test if it is causing a build problem. 
+#%{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -228,10 +230,15 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 # FIXME: Move/rename manpages to correct location (still broke in RC2)
 %if 1
 {
-    mv $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_mandir}/man1x
-    for each in $RPM_BUILD_ROOT%{_mandir}/man1x/* ; do
+    WRONG_DIR=$RPM_BUILD_ROOT%{_mandir}/man1
+    MAN1X_DIR=$RPM_BUILD_ROOT%{_mandir}/man1x
+
+    [ ! -d $MAN1X_DIR ] && mkdir -p $MAN1X_DIR
+    mv ${WRONG_DIR}/* ${MAN1X_DIR}/
+    for each in ${MAN1X_DIR}/* ; do
         mv $each ${each/.1/.1x}
     done
+    rmdir $WRONG_DIR
 }
 %endif