Changeset 946904 in git for Makefile.in


Ignore:
Timestamp:
May 6, 2009, 10:24:16 AM (15 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
348034fcec133223cc4cd1228a3835823dd64b12
Parents:
ac3f4654fa86de4695f160369a7bfac817efe0d8
Message:
*hannes: TMPDIR causes problems on MacOsX


git-svn-id: file:///usr/local/Singular/svn/trunk@11775 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    rac3f465 r946904  
    199199SHAREDIST_DIRS      = Singular doc emacs
    200200
    201 TMPDIR              = ${TMP_DIR}/singdist
     201SI_TMPDIR           = ${TMP_DIR}/singdist
    202202
    203203LN_S            = @LN_S@
    … …  
    227227
    228228sharedist ${SHAREDIST_NAME}.tar.gz:
    229         if test -d ${TMPDIR}; then rm -rf ${TMPDIR}; fi
    230         ${MAKE} install-sharedist localdir=${TMPDIR}
    231         chmod -R a+rX ${TMPDIR}
    232         cd ${TMPDIR}; tar cf - Singular| ${MYGZIP} > ${SHAREDIST_NAME}.tar.gz
    233         mv ${TMPDIR}/${SHAREDIST_NAME}.tar.gz .
    234         rm -rf ${TMPDIR}
     229        if test -d ${SI_TMPDIR}; then rm -rf ${SI_TMPDIR}; fi
     230        ${MAKE} install-sharedist localdir=${SI_TMPDIR}
     231        chmod -R a+rX ${SI_TMPDIR}
     232        cd ${SI_TMPDIR}; tar cf - Singular| ${MYGZIP} > ${SHAREDIST_NAME}.tar.gz
     233        mv ${SI_TMPDIR}/${SHAREDIST_NAME}.tar.gz .
     234        rm -rf ${SI_TMPDIR}
    235235
    236236bindist ${BINDIST_NAME}.tar.gz:
    237         if test -d ${TMPDIR}; then rm -fr ${TMPDIR}; fi
    238         ${MAKE} install-bindist localdir=${TMPDIR}
    239         chmod -R a+rX ${TMPDIR}
    240         cd ${TMPDIR}; tar cf - Singular| ${MYGZIP} > ${BINDIST_NAME}.tar.gz
    241         mv ${TMPDIR}/${BINDIST_NAME}.tar.gz .
    242         rm -rf ${TMPDIR}
     237        if test -d ${SI_TMPDIR}; then rm -fr ${SI_TMPDIR}; fi
     238        ${MAKE} install-bindist localdir=${SI_TMPDIR}
     239        chmod -R a+rX ${SI_TMPDIR}
     240        cd ${SI_TMPDIR}; tar cf - Singular| ${MYGZIP} > ${BINDIST_NAME}.tar.gz
     241        mv ${SI_TMPDIR}/${BINDIST_NAME}.tar.gz .
     242        rm -rf ${SI_TMPDIR}
    243243
    244244static-bindist ${BINDIST_NAME}-static.tar.gz:
    245         if test -d ${TMPDIR}; then rm -fr ${TMPDIR}; fi
    246         ${MAKE} install-bindist localdir=${TMPDIR} LD_STATIC=1
    247         chmod -R a+rX ${TMPDIR}
    248         -rm -f ${TMPDIR}/Singular/*/*/*.so
    249         cd ${TMPDIR}; tar cf - Singular| ${MYGZIP} > ${BINDIST_NAME}-static.tar.gz
    250         mv ${TMPDIR}/${BINDIST_NAME}-static.tar.gz .
    251         rm -rf ${TMPDIR}
     245        if test -d ${SI_TMPDIR}; then rm -fr ${SI_TMPDIR}; fi
     246        ${MAKE} install-bindist localdir=${SI_TMPDIR} LD_STATIC=1
     247        chmod -R a+rX ${SI_TMPDIR}
     248        -rm -f ${SI_TMPDIR}/Singular/*/*/*.so
     249        cd ${SI_TMPDIR}; tar cf - Singular| ${MYGZIP} > ${BINDIST_NAME}-static.tar.gz
     250        mv ${SI_TMPDIR}/${BINDIST_NAME}-static.tar.gz .
     251        rm -rf ${SI_TMPDIR}
    252252
    253253install-root:
    … …  
    261261
    262262cygwin-dist-src singular-base-${CYGWIN_PORT_VER}-src.tar.bz2:
    263         -rm -rf ${TMPDIR}
    264         ${MKINSTALLDIRS} ${TMPDIR}/singular-${CYGWIN_PORT_VER}
     263        -rm -rf ${SI_TMPDIR}
     264        ${MKINSTALLDIRS} ${SI_TMPDIR}/singular-${CYGWIN_PORT_VER}
    265265        export CVS_RSH=ssh; export CVSROOT=:ext:monty.mathematik.uni-kl.de:/usr/local/Singular/cvsroot; \
    266         cd ${TMPDIR}/singular-${CYGWIN_PORT_VER}; cvs co All;
    267         cd  ${TMPDIR}; \
     266        cd ${SI_TMPDIR}/singular-${CYGWIN_PORT_VER}; cvs co All;
     267        cd  ${SI_TMPDIR}; \
    268268        tar cjf singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 singular-${CYGWIN_PORT_VER};
    269         mv ${TMPDIR}/singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 .
    270         -rm -rf ${TMPDIR}
     269        mv ${SI_TMPDIR}/singular-base-${CYGWIN_PORT_VER}-src.tar.bz2 .
     270        -rm -rf ${SI_TMPDIR}
    271271
    272272cygwin-dist-scripts:
    … …  
    380380
    381381cygwin-dist-install: cygwin-dist-scripts ## ${BINDIST_NAME}.tar.gz
    382         if test -d ${TMPDIR}; then rm -fr ${TMPDIR}; fi
    383         ${MKINSTALLDIRS} ${TMPDIR}
    384         tar  --directory=${TMPDIR} -x -z -f ${SHAREDIST_NAME}.tar.gz
    385         -rm -rf ${TMPDIR}/Singular/${S_VERSION}/html
    386         tar  --directory=${TMPDIR} -x -z -f ${BINDIST_NAME}.tar.gz
     382        if test -d ${SI_TMPDIR}; then rm -fr ${SI_TMPDIR}; fi
     383        ${MKINSTALLDIRS} ${SI_TMPDIR}
     384        tar  --directory=${SI_TMPDIR} -x -z -f ${SHAREDIST_NAME}.tar.gz
     385        -rm -rf ${SI_TMPDIR}/Singular/${S_VERSION}/html
     386        tar  --directory=${SI_TMPDIR} -x -z -f ${BINDIST_NAME}.tar.gz
    387387        -rm -rf ${CYGWIN_SINGULAR_ROOT} ${CYGWIN_SINGULAR_DOC} ${CYGWIN_SINGULAR_BIN}
    388388        ${MKINSTALLDIRS} ${CYGWIN_SINGULAR_ROOT} ${CYGWIN_SINGULAR_DOC} ${CYGWIN_SINGULAR_BIN}
    389389## Copy documentation files
    390         cp ${TMPDIR}/Singular/${S_VERSION}/README /usr/share/doc/Singular-${CYGWIN_SING_VER}/
    391         cp ${TMPDIR}/Singular/${S_VERSION}/INSTALL /usr/share/doc/Singular-${CYGWIN_SING_VER}/
    392         cp ${TMPDIR}/Singular/${S_VERSION}/COPYING /usr/share/doc/Singular-${CYGWIN_SING_VER}/
    393         cp ${TMPDIR}/Singular/${S_VERSION}/NEWS /usr/share/doc/Singular-${CYGWIN_SING_VER}/
    394         cp ${TMPDIR}/Singular/${S_VERSION}/GPL* /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     390        cp ${SI_TMPDIR}/Singular/${S_VERSION}/README /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     391        cp ${SI_TMPDIR}/Singular/${S_VERSION}/INSTALL /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     392        cp ${SI_TMPDIR}/Singular/${S_VERSION}/COPYING /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     393        cp ${SI_TMPDIR}/Singular/${S_VERSION}/NEWS /usr/share/doc/Singular-${CYGWIN_SING_VER}/
     394        cp ${SI_TMPDIR}/Singular/${S_VERSION}/GPL* /usr/share/doc/Singular-${CYGWIN_SING_VER}/
    395395## Install Cygwin specific structure
    396396        -rm -rf /lib/surfex
    397         mv ${TMPDIR}/Singular/${S_VERSION}/LIB/surfex /lib/surfex
    398         -mv -u ${TMPDIR}/Singular/${S_VERSION}/LIB/surfex.jar /lib/surfex/surfex.jar
    399         mv ${TMPDIR}/Singular/${S_VERSION}/ix86-Win/* ${CYGWIN_SINGULAR_BIN}/
    400         -rmdir ${TMPDIR}/Singular/${S_VERSION}/ix86-Win
    401         mv ${TMPDIR}/Singular/${S_VERSION}/LIB ${CYGWIN_SINGULAR_ROOT}/
    402         mv ${TMPDIR}/Singular/${S_VERSION}/emacs ${CYGWIN_SINGULAR_ROOT}/
    403         mv ${TMPDIR}/Singular/${S_VERSION}/* ${CYGWIN_SINGULAR_DOC}/
     397        mv ${SI_TMPDIR}/Singular/${S_VERSION}/LIB/surfex /lib/surfex
     398        -mv -u ${SI_TMPDIR}/Singular/${S_VERSION}/LIB/surfex.jar /lib/surfex/surfex.jar
     399        mv ${SI_TMPDIR}/Singular/${S_VERSION}/ix86-Win/* ${CYGWIN_SINGULAR_BIN}/
     400        -rmdir ${SI_TMPDIR}/Singular/${S_VERSION}/ix86-Win
     401        mv ${SI_TMPDIR}/Singular/${S_VERSION}/LIB ${CYGWIN_SINGULAR_ROOT}/
     402        mv ${SI_TMPDIR}/Singular/${S_VERSION}/emacs ${CYGWIN_SINGULAR_ROOT}/
     403        mv ${SI_TMPDIR}/Singular/${S_VERSION}/* ${CYGWIN_SINGULAR_DOC}/
    404404        mv ${CYGWIN_SINGULAR_DOC}/info/singular.hlp /usr/share/info/singular.info
    405405        -rm -f ${CYGWIN_SINGULAR_BIN}/surfex
    … …  
    531531
    532532cygwin-pfw-%:
    533         if test -d ${TMPDIR}; then rm -rf ${TMPDIR}; fi
    534         ${MKINSTALLDIRS} ${TMPDIR}/Files
    535         cp -r ${CYGWIN_ORIG}/$*/* ${TMPDIR}/Files/
    536         touch ${TMPDIR}/Files/release/Singular/singular-helper-${CYGWIN_PORT_VER}.tar.bz2
     533        if test -d ${SI_TMPDIR}; then rm -rf ${SI_TMPDIR}; fi
     534        ${MKINSTALLDIRS} ${SI_TMPDIR}/Files
     535        cp -r ${CYGWIN_ORIG}/$*/* ${SI_TMPDIR}/Files/
     536        touch ${SI_TMPDIR}/Files/release/Singular/singular-helper-${CYGWIN_PORT_VER}.tar.bz2
    537537        @echo "Creating $* distribution ..."
    538         -rm -f  ${TMPDIR}/Files/setup.exe
    539         cp ${CYGWIN_AUX_FILES}/setup-pfw.exe ${TMPDIR}/Files/setup.exe
    540         cat ${CYGWIN_REP_DIR}/setup.ini | sed -e 's/setup-version:.*//' | sed -e 's/setup-timestamp:.*//' >> ${TMPDIR}/Files/setup.ini
     538        -rm -f  ${SI_TMPDIR}/Files/setup.exe
     539        cp ${CYGWIN_AUX_FILES}/setup-pfw.exe ${SI_TMPDIR}/Files/setup.exe
     540        cat ${CYGWIN_REP_DIR}/setup.ini | sed -e 's/setup-version:.*//' | sed -e 's/setup-timestamp:.*//' >> ${SI_TMPDIR}/Files/setup.ini
    541541        @echo Writing Singular.pfw ...
    542         @echo "Version=2.0" >> ${TMPDIR}/Singular.pfw
    543         @echo "" >> ${TMPDIR}/Singular.pfw
    544         @echo "[Options]" >> ${TMPDIR}/Singular.pfw
    545         @echo "Title=Singular ${S_VERSION}: $* Distribution" >> ${TMPDIR}/Singular.pfw
    546         @echo "Company=Department of Mathematics and Center for Computer Algebra, University of Kaiserslautern" >> ${TMPDIR}/Singular.pfw
    547         @echo "CompanyEMail=singular@mathematik.uni-kl.de" >> ${TMPDIR}/Singular.pfw
    548         @echo -n "BasePath="  >> ${TMPDIR}/Singular.pfw
    549         @echo `cygpath -a -w ${TMPDIR}/Files` >> ${TMPDIR}/Singular.pfw
    550         @echo "ImportPath=" >> ${TMPDIR}/Singular.pfw
    551         @echo "UseRTF=1" >> ${TMPDIR}/Singular.pfw
    552         @echo "SaveFiles=0" >> ${TMPDIR}/Singular.pfw
    553         @echo "SubFolders=1" >> ${TMPDIR}/Singular.pfw
    554         @echo "ApplicationName=Singular ${S_VERSION} Build `date -u +%D' UTC '%T`" >> ${TMPDIR}/Singular.pfw
    555         @echo "Description=A Computer Algebra System For Polynomial Computations" >> ${TMPDIR}/Singular.pfw
    556         @echo "Comments=Authors: G.-M. Greuel, G. Pfister, H. Schoenemann" >> ${TMPDIR}/Singular.pfw
    557         @echo "Notice=Distributed under General Public License (GPL)" >> ${TMPDIR}/Singular.pfw
    558         @echo "Version=@SINGULAR_VERSION@" >> ${TMPDIR}/Singular.pfw
    559         @echo -n "OutputSpec=" >> ${TMPDIR}/Singular.pfw
    560         @echo -n "`cygpath -a -w .`" >> ${TMPDIR}/Singular.pfw
    561         @echo "\Singular-${S_VERSION}-$*.exe" >> ${TMPDIR}/Singular.pfw
    562         @echo "GUIDs=0" >> ${TMPDIR}/Singular.pfw
    563         @echo "Type=2" >> ${TMPDIR}/Singular.pfw
    564         @echo "Compress=1" >> ${TMPDIR}/Singular.pfw
    565         @echo "Sign=0" >> ${TMPDIR}/Singular.pfw
    566         @echo "Transfer=0" >> ${TMPDIR}/Singular.pfw
    567         @echo "" >> ${TMPDIR}/Singular.pfw
    568         @echo "[Runtime]" >> ${TMPDIR}/Singular.pfw
    569         @echo "Welcome=" >> ${TMPDIR}/Singular.pfw
    570         @echo -n "License=" >> ${TMPDIR}/Singular.pfw
    571         @echo -n "`cygpath -a -w .`" >> ${TMPDIR}/Singular.pfw
    572         @echo "\GPL" >> ${TMPDIR}/Singular.pfw
    573         @echo "Prompt=" >> ${TMPDIR}/Singular.pfw
    574         @echo "Password=" >> ${TMPDIR}/Singular.pfw
    575         @echo "DefaultPath=" >> ${TMPDIR}/Singular.pfw
    576         @echo "Language=English" >> ${TMPDIR}/Singular.pfw
    577         @echo "WindowStyle=0" >> ${TMPDIR}/Singular.pfw
    578         @echo "Options=33" >> ${TMPDIR}/Singular.pfw
    579         @echo "Execute=setup.exe" >> ${TMPDIR}/Singular.pfw
    580         @echo "CmdLine=-L -q -n" >> ${TMPDIR}/Singular.pfw
    581         @echo "AllowChangeTarget=0" >> ${TMPDIR}/Singular.pfw
    582         @echo "AllowDelete=0" >> ${TMPDIR}/Singular.pfw
    583         @echo "LaunchEXE=1" >> ${TMPDIR}/Singular.pfw
    584         @echo "" >> ${TMPDIR}/Singular.pfw
    585         @echo "[Extension]" >> ${TMPDIR}/Singular.pfw
    586         @echo "Server=" >> ${TMPDIR}/Singular.pfw
    587         @echo "Calls=0" >> ${TMPDIR}/Singular.pfw
     542        @echo "Version=2.0" >> ${SI_TMPDIR}/Singular.pfw
     543        @echo "" >> ${SI_TMPDIR}/Singular.pfw
     544        @echo "[Options]" >> ${SI_TMPDIR}/Singular.pfw
     545        @echo "Title=Singular ${S_VERSION}: $* Distribution" >> ${SI_TMPDIR}/Singular.pfw
     546        @echo "Company=Department of Mathematics and Center for Computer Algebra, University of Kaiserslautern" >> ${SI_TMPDIR}/Singular.pfw
     547        @echo "CompanyEMail=singular@mathematik.uni-kl.de" >> ${SI_TMPDIR}/Singular.pfw
     548        @echo -n "BasePath="  >> ${SI_TMPDIR}/Singular.pfw
     549        @echo `cygpath -a -w ${SI_TMPDIR}/Files` >> ${SI_TMPDIR}/Singular.pfw
     550        @echo "ImportPath=" >> ${SI_TMPDIR}/Singular.pfw
     551        @echo "UseRTF=1" >> ${SI_TMPDIR}/Singular.pfw
     552        @echo "SaveFiles=0" >> ${SI_TMPDIR}/Singular.pfw
     553        @echo "SubFolders=1" >> ${SI_TMPDIR}/Singular.pfw
     554        @echo "ApplicationName=Singular ${S_VERSION} Build `date -u +%D' UTC '%T`" >> ${SI_TMPDIR}/Singular.pfw
     555        @echo "Description=A Computer Algebra System For Polynomial Computations" >> ${SI_TMPDIR}/Singular.pfw
     556        @echo "Comments=Authors: G.-M. Greuel, G. Pfister, H. Schoenemann" >> ${SI_TMPDIR}/Singular.pfw
     557        @echo "Notice=Distributed under General Public License (GPL)" >> ${SI_TMPDIR}/Singular.pfw
     558        @echo "Version=@SINGULAR_VERSION@" >> ${SI_TMPDIR}/Singular.pfw
     559        @echo -n "OutputSpec=" >> ${SI_TMPDIR}/Singular.pfw
     560        @echo -n "`cygpath -a -w .`" >> ${SI_TMPDIR}/Singular.pfw
     561        @echo "\Singular-${S_VERSION}-$*.exe" >> ${SI_TMPDIR}/Singular.pfw
     562        @echo "GUIDs=0" >> ${SI_TMPDIR}/Singular.pfw
     563        @echo "Type=2" >> ${SI_TMPDIR}/Singular.pfw
     564        @echo "Compress=1" >> ${SI_TMPDIR}/Singular.pfw
     565        @echo "Sign=0" >> ${SI_TMPDIR}/Singular.pfw
     566        @echo "Transfer=0" >> ${SI_TMPDIR}/Singular.pfw
     567        @echo "" >> ${SI_TMPDIR}/Singular.pfw
     568        @echo "[Runtime]" >> ${SI_TMPDIR}/Singular.pfw
     569        @echo "Welcome=" >> ${SI_TMPDIR}/Singular.pfw
     570        @echo -n "License=" >> ${SI_TMPDIR}/Singular.pfw
     571        @echo -n "`cygpath -a -w .`" >> ${SI_TMPDIR}/Singular.pfw
     572        @echo "\GPL" >> ${SI_TMPDIR}/Singular.pfw
     573        @echo "Prompt=" >> ${SI_TMPDIR}/Singular.pfw
     574        @echo "Password=" >> ${SI_TMPDIR}/Singular.pfw
     575        @echo "DefaultPath=" >> ${SI_TMPDIR}/Singular.pfw
     576        @echo "Language=English" >> ${SI_TMPDIR}/Singular.pfw
     577        @echo "WindowStyle=0" >> ${SI_TMPDIR}/Singular.pfw
     578        @echo "Options=33" >> ${SI_TMPDIR}/Singular.pfw
     579        @echo "Execute=setup.exe" >> ${SI_TMPDIR}/Singular.pfw
     580        @echo "CmdLine=-L -q -n" >> ${SI_TMPDIR}/Singular.pfw
     581        @echo "AllowChangeTarget=0" >> ${SI_TMPDIR}/Singular.pfw
     582        @echo "AllowDelete=0" >> ${SI_TMPDIR}/Singular.pfw
     583        @echo "LaunchEXE=1" >> ${SI_TMPDIR}/Singular.pfw
     584        @echo "" >> ${SI_TMPDIR}/Singular.pfw
     585        @echo "[Extension]" >> ${SI_TMPDIR}/Singular.pfw
     586        @echo "Server=" >> ${SI_TMPDIR}/Singular.pfw
     587        @echo "Calls=0" >> ${SI_TMPDIR}/Singular.pfw
    588588        cd ${CYGWIN_PFW_DIR}; \
    589         ${CYGWIN_PFW_EXEC} -a -s "`cygpath -a -w ${TMPDIR}/Singular.pfw`"
     589        ${CYGWIN_PFW_EXEC} -a -s "`cygpath -a -w ${SI_TMPDIR}/Singular.pfw`"
    590590
    591591singular-cd-windows:
    … …  
    624624_static-bindist: ${SINGULAR}
    625625        cd Singular; ${MAKE} Singular-$@ libparse
    626         rm -rf ${TMPDIR}
    627         ${MKINSTALLDIRS} ${TMPDIR}/${BINDIR_NAME}
    628         cp Singular/Singular-$@ ${TMPDIR}/${BINDIR_NAME}/Singular-static
    629         cp Singular/libparse ${TMPDIR}/${BINDIR_NAME}
    630         -strip ${TMPDIR}/${BINDIR_NAME}/*
     626        rm -rf ${SI_TMPDIR}
     627        ${MKINSTALLDIRS} ${SI_TMPDIR}/${BINDIR_NAME}
     628        cp Singular/Singular-$@ ${SI_TMPDIR}/${BINDIR_NAME}/Singular-static
     629        cp Singular/libparse ${SI_TMPDIR}/${BINDIR_NAME}
     630        -strip ${SI_TMPDIR}/${BINDIR_NAME}/*
    631631        cat INSTALL.unix | sed -e "s/<x-y-z>/${S_VERSION}/g" > \
    632                       ${TMPDIR}/Singular/INSTALL
    633         cd ${TMPDIR}; chmod -R a+rX *;\
     632                      ${SI_TMPDIR}/Singular/INSTALL
     633        cd ${SI_TMPDIR}; chmod -R a+rX *;\
    634634           tar cf - Singular | ${MYGZIP} > ${BINDIST_NAME}-static.tar.gz
    635         mv ${TMPDIR}/${BINDIST_NAME}-static.tar.gz .
    636         rm -rf ${TMPDIR}
     635        mv ${SI_TMPDIR}/${BINDIST_NAME}-static.tar.gz .
     636        rm -rf ${SI_TMPDIR}
    637637
    638638_infodist:
    639         rm -rf ${TMPDIR}
    640         ${MKINSTALLDIRS} ${TMPDIR}/${SINGUNAME}/bin/
    641         cp `which info` ${TMPDIR}/${SINGUNAME}/bin/
    642         -strip ${TMPDIR}/${SINGUNAME}/bin/info
    643         cd ${TMPDIR}; tar cf - ${SINGUNAME} | ${MYGZIP}  > info-${SINGUNAME}.tar.gz
    644         mv ${TMPDIR}/info-${SINGUNAME}.tar.gz .
    645         rm -rf ${TMPDIR}
     639        rm -rf ${SI_TMPDIR}
     640        ${MKINSTALLDIRS} ${SI_TMPDIR}/${SINGUNAME}/bin/
     641        cp `which info` ${SI_TMPDIR}/${SINGUNAME}/bin/
     642        -strip ${SI_TMPDIR}/${SINGUNAME}/bin/info
     643        cd ${SI_TMPDIR}; tar cf - ${SINGUNAME} | ${MYGZIP}  > info-${SINGUNAME}.tar.gz
     644        mv ${SI_TMPDIR}/info-${SINGUNAME}.tar.gz .
     645        rm -rf ${SI_TMPDIR}
    646646
    647647INSTALL         = ./Singular/install-sh -c
    … …  
    652652windist: ${SINGULAR}
    653653        cd Singular; ${MAKE} install-bindist
    654         rm -rf ${TMPDIR}
    655         ${MKINSTALLDIRS} ${TMPDIR}/${BINDIR_NAME}
     654        rm -rf ${SI_TMPDIR}
     655        ${MKINSTALLDIRS} ${SI_TMPDIR}/${BINDIR_NAME}
    656656        ${INSTALL} Singular/Singular-bindist \
    657                    ${TMPDIR}/${BINDIR_NAME}/Singular.exe
    658         ${INSTALL} Singular/libparse ${TMPDIR}/${BINDIR_NAME}
    659         ${INSTALL} ${SH_PROGRAM} ${TMPDIR}/${BINDIR_NAME}
    660         ${INSTALL} ${INFO_PROGRAM} ${TMPDIR}/${BINDIR_NAME}
    661         ${INSTALL} ${CYGWIN_DLL} ${TMPDIR}/${BINDIR_NAME}
     657                   ${SI_TMPDIR}/${BINDIR_NAME}/Singular.exe
     658        ${INSTALL} Singular/libparse ${SI_TMPDIR}/${BINDIR_NAME}
     659        ${INSTALL} ${SH_PROGRAM} ${SI_TMPDIR}/${BINDIR_NAME}
     660        ${INSTALL} ${INFO_PROGRAM} ${SI_TMPDIR}/${BINDIR_NAME}
     661        ${INSTALL} ${CYGWIN_DLL} ${SI_TMPDIR}/${BINDIR_NAME}
    662662        cat INSTALL.win | sed -e "s/<x-y-z>/${S_VERSION}/g" > \
    663                          ${TMPDIR}/Singular/INSTALL
    664         cd ${TMPDIR}; chmod -R a+rX *;\
     663                         ${SI_TMPDIR}/Singular/INSTALL
     664        cd ${SI_TMPDIR}; chmod -R a+rX *;\
    665665           ${ZIP} -r sing Singular
    666         mv ${TMPDIR}/sing.zip Singular-${S_VERSION}-${SINGUNAME}.zip
    667         rm -rf ${TMPDIR}
     666        mv ${SI_TMPDIR}/sing.zip Singular-${S_VERSION}-${SINGUNAME}.zip
     667        rm -rf ${SI_TMPDIR}
    668668
    669669srcdist:
    670         rm -rf ${TMPDIR}
    671         ${MKINSTALLDIRS} ${TMPDIR}/Singular-${S_VERSION}
    672         cd ${TMPDIR}/Singular-${S_VERSION}; cvs co All
    673         cd  ${TMPDIR}; \
     670        rm -rf ${SI_TMPDIR}
     671        ${MKINSTALLDIRS} ${SI_TMPDIR}/Singular-${S_VERSION}
     672        cd ${SI_TMPDIR}/Singular-${S_VERSION}; cvs co All
     673        cd  ${SI_TMPDIR}; \
    674674        tar cf - Singular-${S_VERSION}| ${MYGZIP} > Singular-${S_VERSION}.tar.gz
    675         cp ${TMPDIR}/Singular-${S_VERSION}.tar.gz .
    676         rm -rf ${TMPDIR}
     675        cp ${SI_TMPDIR}/Singular-${S_VERSION}.tar.gz .
     676        rm -rf ${SI_TMPDIR}
    677677
    678678# You can remeber the password with "iwd" == "ich war dabei"
Note: See TracChangeset for help on using the changeset viewer.