Changeset 939 in MondoRescue for trunk/mindi/distributions

Timestamp:

Nov 17, 2006, 1:41:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r931:938 $SVN_M/branches/stable

Location:

trunk/mindi/distributions

Files:

• debian/rules (modified) (1 diff)
• gentoo/mindi.ebuild (modified) (1 diff)
• rpm/mindi.spec (modified) (2 diffs)

trunk/mindi/distributions/debian/rules

@@ -26 +26 @@
     dh_installdirs
     # Build the installation tree:
-    ( export RPMBUILDMINDI=true && export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
+    ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export PREFIX=/usr && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
 
 # Build architecture-independent files here.

trunk/mindi/distributions/gentoo/mindi.ebuild

@@ -26 +26 @@
 
 src_install() {
-    export PREFIX="${D}/usr"
-    export CONFDIR="${D}/etc"
+    export HEAD="${D}"
+    export PREFIX="/usr"
+    export CONFDIR="/etc"
+    export MANDIR="${PREFIX}/share/man"
+    export DOCDIR="${PREFIX}/share/doc"
+    export LIBDIR="${PREFIX}/lib"
     export DONT_RELINK=1
     export RPMBUILDMINDI="true"

trunk/mindi/distributions/rpm/mindi.spec

@@ -36 +36 @@
 export DONT_RELINK=1
 
-export PREFIX=${RPM_BUILD_ROOT}%{_exec_prefix}
-export CONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir}
+export HEAD=${RPM_BUILD_ROOT}
+export PREFIX=%{_exec_prefix}
+# Bug on x86_64 on _sysconfdir on rhel4 at least
+%ifarch x86_64
+export CONFDIR=/etc
+%else
+export CONFDIR=%{_sysconfdir}
+%endif
+export MANDIR=%{_mandir}
+export DOCDIR=%{_docdir}
+export LIBDIR=%{_libdir}
 export RPMBUILDMINDI="true"
 
@@ -44 +53 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
-
-%post
-if [ -f /usr/local/sbin/mindi ]; then
-    echo "WARNING: /usr/local/sbin/mindi exists. You should probably remove your manual mindi installation !"
-fi
 
 %files