Changeset 3239 in MondoRescue for branches/3.2/mindi

Timestamp:

Jan 5, 2014, 1:35:28 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix build process for perl modules deps (creation of the perl-scripts file was incorrect with build dir in it, and overwritten)
• Fix pod2man issue on mondorescue.conf by adding pod content in it which is then processed in the Makefile.PL

Location:

branches/3.2/mindi

Files:

• install.sh (modified) (2 diffs)
• mindi (modified) (1 diff)

branches/3.2/mindi/install.sh

@@ -55 +55 @@
 fi
 if [ _"$SBINDIR" = _"" ]; then
+    subsbin=$local/sbin
     SBINDIR=$local/sbin
 else
+    subsbin=$SBINDIR
     SBINDIR=${HEAD}$SBINDIR
 fi
@@ -98 +100 @@
     install -m 644 $s.8 $MANDIR
     # Generate the list of perl modules needed at restore time for mindi
-    cat > $conf/perl-scripts << EOF
-$SBINDIR/$s
+    cat >> $conf/perl-scripts << EOF
+$subsbin/$s
 EOF
 done

branches/3.2/mindi/mindi

@@ -2641 +2641 @@
 
     # Management of perl scripts delivered needed at restore time
-    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` > $MINDI_TMP/perl.lis
+    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` /usr/bin/mr-* > $MINDI_TMP/perl.lis
     tar cf - `cat $MINDI_TMP/perl.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in perl scripts analysis" $MINDI_TMP/$$.log