Changeset 3640 in MondoRescue for branches

Timestamp:

Dec 23, 2016, 6:40:23 PM (7 years ago)

Author:

Bruno Cornec

Message:

fix mondo-doc build for deb based distros where dash is the default shell which doesn't support braces processing !!

Location:

branches/3.3/mondo-doc

Files:

• Makefile.howto (modified) (2 diffs)
• Makefile.man (modified) (3 diffs)

branches/3.3/mondo-doc/Makefile.howto

@@ -57 +57 @@
     @echo "Cleaning up the documentation directory for the Howto"
     @echo ""
-    @rm -fr $(TARGET).{aux,log,out,tex,dvi,pdf,ps,txt,rtf,html} $(TARGET)
+    @bash -c "rm -fr $(TARGET).{aux,log,out,tex,dvi,pdf,ps,txt,rtf,html} $(TARGET)"
 
 install: all
@@ -63 +63 @@
     @echo "Delivering mondorescue howto"
     @echo ""
-    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a $(TARGET).{html,pdf,ps,txt,rtf} $(TARGET) ${INSTALLDIR} ; cp -a ${IMAGESDIR} ${INSTALLDIR}/$(TARGET) ; else echo "No INSTALLDIR specified aborting install"; fi
+    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; bash -c "cp -a $(TARGET).{html,pdf,ps,txt,rtf} $(TARGET) ${INSTALLDIR}" ; cp -a ${IMAGESDIR} ${INSTALLDIR}/$(TARGET) ; else echo "No INSTALLDIR specified aborting install"; fi

branches/3.3/mondo-doc/Makefile.man

@@ -52 +52 @@
     @echo "Cleaning up the documentation directory for man pages"
     @echo ""
-    @rm -f *.8.{dvi,pdf,ps,txt,html}
+    @bash -c "rm -f *.8.{dvi,pdf,ps,txt,html}"
 
 install: install-mindi install-mondo
@@ -60 +60 @@
     @echo "Delivering mindi man page"
     @echo ""
-    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a mindi.8.{html,pdf,ps,txt} mindi.8 ${INSTALLDIR} ; else echo "No INSTALLDIR specified aborting install"; fi
+    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; bash -c "cp -a mindi.8.{html,pdf,ps,txt} mindi.8 ${INSTALLDIR}" ; else echo "No INSTALLDIR specified aborting install"; fi
 
 install-mondo: all
@@ -66 +66 @@
     @echo "Delivering mondo man pages"
     @echo ""
-    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a mondo*.8.{html,pdf,ps,txt} mondo*.8 ${INSTALLDIR} ; else echo "No INSTALLDIR specified aborting install"; fi
+    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; bash -c "cp -a mondo*.8.{html,pdf,ps,txt} mondo*.8 ${INSTALLDIR}" ; else echo "No INSTALLDIR specified aborting install"; fi