added our own implementation of strto[u]ll() if the system doesn't have one (patch...

[wxWidgets.git] / wxPython / distrib / makerpm

diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index 3d21e5a7c6e9dece117d97d11a6b05d9a5e6c063..5acb514db4ce4bcf37018a676c8ef8aa76656550 100755 (executable)
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -3,6 +3,7 @@
 # Build an RPM containing both wxGTK and wxPython
 
 ##set -o xtrace
 # Build an RPM containing both wxGTK and wxPython
 
 ##set -o xtrace

+##set -o errexit

 
 spectemplate=distrib/wxPythonFull.spec.in
 
 
 spectemplate=distrib/wxPythonFull.spec.in
 


@@ -28,6 +29,7 @@ lcport=gtk
 unicode=0
 tarname=wxPython-src
 srpmonly=0
 unicode=0
 tarname=wxPython-src
 srpmonly=0

+skipclean=0

 
 #----------------------------------------------------------------------
 # Check parameters
 
 #----------------------------------------------------------------------
 # Check parameters


@@ -167,7 +169,7 @@ if [ -z "${skipcopy}" ]; then
     rm -f ChangeLog
     rm *.spec
     rm -rf distrib/msw/tmake
     rm -f ChangeLog
     rm *.spec
     rm -rf distrib/msw/tmake

-    rm -rf docs/html
+    #rm -rf docs/html

     #rm -rf docs/latex
     #rm -rf contrib/docs
     #rm -rf contrib/samples
     #rm -rf docs/latex
     #rm -rf contrib/docs
     #rm -rf contrib/samples


@@ -235,7 +237,7 @@ fi
 #----------------------------------------------------------------------
 # build the RPM
 
 #----------------------------------------------------------------------
 # build the RPM
 

-if [ -z "${skiprpm}" ]; then
+if [ "${skiprpm}" != "1" ]; then

     echo "*** Building RPMs..."
     cp ${distdir}/${tarver}.tar.bz2 ${rpmtop}/SOURCES
 
     echo "*** Building RPMs..."
     cp ${distdir}/${tarver}.tar.bz2 ${rpmtop}/SOURCES
 


@@ -281,7 +283,7 @@ fi
 #----------------------------------------------------------------------
 # Cleanup
 
 #----------------------------------------------------------------------
 # Cleanup
 

-if [ -z ${skipclean} ]; then
+if [ "${skipclean}" = "0" ]; then

     echo "*** Cleaning up"
     rm -rf ${rpmtop}
     rm -rf ${builddir}
     echo "*** Cleaning up"
     rm -rf ${rpmtop}
     rm -rf ${builddir}