Changeset 933 in MondoRescue

Timestamp:

Nov 15, 2006, 6:30:04 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix a rpm build issue on x86_64

Location:

branches/stable/mindi

Files:

• distributions/rpm/mindi.spec (modified) (1 diff)
• install.sh (modified) (1 diff)

branches/stable/mindi/distributions/rpm/mindi.spec

@@ -38 +38 @@
 export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
 export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
+export MANDIR=${RPM_BUILD_ROOT}%{_mandir}
+export LIBDIR=${RPM_BUILD_ROOT}%{_libdir}
+export DOCDIR=${RPM_BUILD_ROOT}%{_docdir}
 export RPMBUILDMINDI="true"
 

branches/stable/mindi/install.sh

@@ -34 +34 @@
 echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local"
 
-DOCDIR=$local/share/doc/mindi-$MINDIVER
-MANDIR=$local/share/man/man8
-
-ARCH=`/bin/arch`
-echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
-echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
-echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
-export ARCH
+if [ _"$MANDIR" == _"" ]; then
+    MANDIR=$local/share/man/man8
+else
+    MANDIR=$MANDIR/man8
+fi
+if [ _"$DOCDIR" == _"" ]; then
+    DOCDIR=$local/share/doc/mindi-$MINDIVER
+else
+    DOCDIR=$DOCDIR/mindi-$MINDIVER
+fi
+if [ _"$LIBDIR" == _"" ]; then
+    locallib=$LIBDIR
+else
+    ARCH=`/bin/arch`
+    echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib
+    echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64
+    echo $ARCH | grep -E '^ia64$' &> /dev/null && locallib=$local/lib
+    export ARCH
+fi
 
 echo "Creating target directories ..."