Changeset d443e9 in git for Makefile.in


Ignore:
Timestamp:
Sep 1, 2005, 10:28:34 AM (19 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
19163b348fbf58484965082ac14a288e24972a95
Parents:
8661e8cd7dbba4e92357b730c923dedef803cc89
Message:
Makefile.in:
--->Verzeichnisstruktur an Cygwin angepasst (nur cygwin-* targets)


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

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r8661e8c rd443e9  
    128128localdir              = /usr/local
    129129install_prefix        = ${localdir}/Singular/${S_VERSION}
     130
     131##############################################################
     132# cygwin related stuff
     133#
    130134CYGWIN_PORT_VER       = @SINGULAR_RPM_VERSION@-1
    131135CYGWIN_SETUP_VER      = 2.457.2.2
    … …  
    134138CYGWIN_PFW_DIR        = /cygdrive/c/Programme/InstallShield/PackageForTheWeb\ 4/
    135139CYGWIN_PFW_EXEC       = pftwwiz.exe
    136 #CYGWIN_MAKE_DIR      := $(shell cygpath -a -w .)
    137140CYGWIN_ORIG           = external-cygwin
    138 CYGWIN_SINGULAR_BASE  = /opt
    139141CYGWIN_SINGULAR_DIR   = Singular
     142CYGWIN_SINGULAR_ROOT  = /usr/share/${CYGWIN_SINGULAR_DIR}
     143CYGWIN_SINGULAR_BIN   = /usr/lib/${CYGWIN_SINGULAR_DIR}
     144CYGWIN_SINGULAR_DOC   = /usr/share/doc/${CYGWIN_SINGULAR_DIR}-${CYGWIN_PORT_VER}
     145
    140146
    141147BINDIST_DIRS        = kernel Singular doc IntegerProgramming modules
    … …  
    247253        -rm -rf ${TMPDIR}
    248254
    249 cygwin-dist-install: ## ${BINDIST_NAME}.tar.gz
    250         if test -d ${TMPDIR}; then rm -fr ${TMPDIR}; fi
    251         ${MKINSTALLDIRS} ${TMPDIR}
    252         tar  --directory=${TMPDIR} -x -z -f ${SHAREDIST_NAME}.tar.gz
    253         -rm -r -f ${TMPDIR}/html
    254         tar  --directory=${TMPDIR} -x -z -f ${BINDIST_NAME}.tar.gz
    255         -rm -rf ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}
    256         ${MKINSTALLDIRS} ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}
    257         mv ${TMPDIR}/Singular/${S_VERSION}/* ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}
    258         cp ${CYGWIN_AUX_FILES}/surf.exe ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win
    259         cp ${CYGWIN_AUX_FILES}/SURF_AUTHORS ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win
    260         cp ${CYGWIN_AUX_FILES}/SURF_README ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win
    261         cp ${CYGWIN_AUX_FILES}/SURF_COPYING ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win
    262         cp ${CYGWIN_AUX_FILES}/Manual.chm ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/doc
    263         cp ${CYGWIN_AUX_FILES}/startxserver.bat ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win
    264         unix2dos ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/startxserver.bat
    265 ##      Download setup exe
    266         export http_proxy=http://positron:3128; \
    267         wget http://cygwin.com/setup.exe -O ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/cygwin-setup.exe
    268 ##      or copy from local folder
    269 #       cp ${CYGWIN_AUX_FILES}/cygwin-setup.exe ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/cygwin-setup.exe
     255cygwin-dist-scripts:
    270256        @echo -e  "Writing /etc/postinstall/singular-icons.sh"
    271257        @echo -e  '#!/bin/sh' > /etc/postinstall/singular-icons.sh
    … …  
    277263        @echo -e  '# Cygwin - Setup' >> /etc/postinstall/singular-icons.sh
    278264        @echo -e  'mkshortcut -A -a \047\047 \' >> /etc/postinstall/singular-icons.sh
    279         @echo -e  '       -i ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/cygwin-setup.exe -n "Singular CAS\\Cygwin\\Setup (Cygwin)" \' >> /etc/postinstall/singular-icons.sh
    280         @echo -e  '       -P ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/cygwin-setup.exe \' >> /etc/postinstall/singular-icons.sh
     265        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe -n "Singular CAS\\Cygwin\\Setup (Cygwin)" \' >> /etc/postinstall/singular-icons.sh
     266        @echo -e  '       -P ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe \' >> /etc/postinstall/singular-icons.sh
    281267        @echo -e  '       -d "Use this program to update, modify or remove your Singular and Cygwin installation"' >> /etc/postinstall/singular-icons.sh
    282268        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    … …  
    284270        @echo -e  'mkshortcut -A -a \047\047 \' >> /etc/postinstall/singular-icons.sh
    285271        @echo -e  '       -P /cygwin.bat -n "Singular CAS\\Cygwin\\Bash shell" \' >> /etc/postinstall/singular-icons.sh
    286         @echo -e  '       -i ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/cygwin-setup.exe \' >> /etc/postinstall/singular-icons.sh
     272        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe \' >> /etc/postinstall/singular-icons.sh
    287273        @echo -e  '       -d "A simple bash shell"' >> /etc/postinstall/singular-icons.sh
    288274        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    … …  
    306292        @echo -e  '##################### Singular CAS' >> /etc/postinstall/singular-icons.sh
    307293        @echo -e  '# Emacs + Singular EXP' >> /etc/postinstall/singular-icons.sh
    308         @echo -e  'mkshortcut -A -a \047-c "${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/startxserver.bat && export PATH=/usr/X11R6/bin:/bin:$PATH && export DISPLAY=127.0.0.1:0.0 && ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/runESingular.exe"\047 \' >> /etc/postinstall/singular-icons.sh
    309         @echo -e  '       -i ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/runESingular.exe -n "Singular CAS\\Singular (Emacs and X-Server) (experimental)" \' >> /etc/postinstall/singular-icons.sh
    310         @echo -e  '       -w /usr/X11R6/bin \' >> /etc/postinstall/singular-icons.sh
    311         @echo -e  '       -P /bin/bash -d "Start Singular in emacs and starting the x-server"' >> /etc/postinstall/singular-icons.sh
     294        @echo -e  'mkshortcut -A -a \047bash -l -c "/usr/share/lib/Singular/startxserver.bat && sleep 1 &&  ESingular"\047 \' >> /etc/postinstall/singular-icons.sh
     295        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/runESingular.exe -n "Singular CAS\\Singular (Emacs and X-Server) (experimental)" \' >> /etc/postinstall/singular-icons.sh
     296        @echo -e  '       -w /bin \' >> /etc/postinstall/singular-icons.sh
     297        @echo -e  '       -P /usr/X11R6/bin/run.exe -d "Start Singular in emacs after starting the x-server"' >> /etc/postinstall/singular-icons.sh
    312298        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    313299        @echo -e  '# Singular in rxvt' >> /etc/postinstall/singular-icons.sh
    314300        @echo -e  'mkshortcut -A -a \047-rv -fn "FixedSys" -e /bin/bash --login -i -c Singular\047 \' >> /etc/postinstall/singular-icons.sh
    315         @echo -e  '       -i ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/runTSingular.exe -n "Singular CAS\\Singular (rxvt)" \' >> /etc/postinstall/singular-icons.sh
     301        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/runTSingular.exe -n "Singular CAS\\Singular (rxvt)" \' >> /etc/postinstall/singular-icons.sh
    316302        @echo -e  '       -P /bin/rxvt -d "Start Singular in a rxvt terminal"' >> /etc/postinstall/singular-icons.sh
    317303        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    318304        @echo -e  '# Singular in Dos mode' >> /etc/postinstall/singular-icons.sh
    319         @echo -e  'mkshortcut -A -a \047--login -i -c "export DISPLAY=127.0.0.1:0.0 && export PATH=/bin:$PATH && Singular"\047 \' >> /etc/postinstall/singular-icons.sh
    320         @echo -e  '       -i ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/Singular.exe -n "Singular CAS\\Singular (Terminal)" \' >> /etc/postinstall/singular-icons.sh
     305        @echo -e  'mkshortcut -A -a Singular \' >> /etc/postinstall/singular-icons.sh
     306        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/Singular.exe -n "Singular CAS\\Singular (Terminal)" \' >> /etc/postinstall/singular-icons.sh
    321307        @echo -e  '       -P /bin/bash -d "Start Singular in a Microsoft terminal"' >> /etc/postinstall/singular-icons.sh
    322308        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    323309        @echo -e  '# Singular in Emacs' >> /etc/postinstall/singular-icons.sh
    324         @echo -e  'mkshortcut -A -a \047-c "export DISPLAY=127.0.0.1:0.0 && export PATH=/usr/X11R6/bin:/bin:$PATH && ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/runESingular.exe"\047 \' >> /etc/postinstall/singular-icons.sh
    325         @echo -e  '       -i ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/runESingular.exe -n "Singular CAS\\Singular (Emacs)" \' >> /etc/postinstall/singular-icons.sh
    326         @echo -e  '       -w /usr/X11R6/bin \' >> /etc/postinstall/singular-icons.sh
    327         @echo -e  '       -P /bin/bash -d "Start Singular in emacs"' >> /etc/postinstall/singular-icons.sh
     310        @echo -e  'mkshortcut -A -a \047bash -l ESingular\047 \' >> /etc/postinstall/singular-icons.sh
     311        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/runESingular.exe -n "Singular CAS\\Singular (Emacs)" \' >> /etc/postinstall/singular-icons.sh
     312        @echo -e  '       -w /bin \' >> /etc/postinstall/singular-icons.sh
     313        @echo -e  '       -P /usr/X11R6/bin/run.exe \' >> /etc/postinstall/singular-icons.sh
     314        @echo -e  '       -d "Start Singular in emacs"' >> /etc/postinstall/singular-icons.sh
    328315        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    329316        @echo -e  '# Only XServer' >> /etc/postinstall/singular-icons.sh
    … …  
    331318        @echo -e  '       -i /usr/X11R6/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
    332319        @echo -e  '       -w /usr/X11R6/bin \' >> /etc/postinstall/singular-icons.sh
    333         @echo -e  '       -P ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/startxserver.bat -n "Singular CAS\\Start X - Server (needed for emacs and surf)" \' >> /etc/postinstall/singular-icons.sh
     320        @echo -e  '       -P ${CYGWIN_SINGULAR_BIN}/startxserver.bat -n "Singular CAS\\Start X - Server (needed for emacs and surf)" \' >> /etc/postinstall/singular-icons.sh
    334321        @echo -e  '       -d "This starts the cygwin X-Server. Without XServer Emacs and Surf do work."' >> /etc/postinstall/singular-icons.sh
    335322        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    … …  
    339326        @echo -e  '       -i /usr/X11R6/bin/XWin.exe \' >> /etc/postinstall/singular-icons.sh
    340327        @echo -e  '       -w /usr/X11R6/bin \' >> /etc/postinstall/singular-icons.sh
    341         @echo -e  '       -D ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/startxserver.bat -n "Start X - Server (needed for emacs and surf)" \' >> /etc/postinstall/singular-icons.sh
     328        @echo -e  '       -D ${CYGWIN_SINGULAR_BIN}/startxserver.bat -n "Start X - Server (needed for emacs and surf)" \' >> /etc/postinstall/singular-icons.sh
    342329        @echo -e  '       -d "This starts the cygwin X-Server. Without XServer Emacs and Surf do work."' >> /etc/postinstall/singular-icons.sh
    343330        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    344         @echo -e  '# Singular in Emacs' >> /etc/postinstall/singular-icons.sh
    345         @echo -e  'mkshortcut -A -a \047-c "export DISPLAY=127.0.0.1:0.0 && export PATH=/usr/X11R6/bin:/bin:$PATH && ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/runESingular.exe"\047 \' >> /etc/postinstall/singular-icons.sh
    346         @echo -e  '       -i ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/runESingular.exe -n "Singular (Emacs)" \' >> /etc/postinstall/singular-icons.sh
    347         @echo -e  '       -w /usr/X11R6/bin \' >> /etc/postinstall/singular-icons.sh
    348         @echo -e  '       -D /bin/bash -d "Start Singular in Emacs"' >> /etc/postinstall/singular-icons.sh
     331        @echo -e  'mkshortcut -A -a \047bash -l ESingular\047 \' >> /etc/postinstall/singular-icons.sh
     332        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/runESingular.exe -n "Singular (Emacs)" \' >> /etc/postinstall/singular-icons.sh
     333        @echo -e  '       -w /bin \' >> /etc/postinstall/singular-icons.sh
     334        @echo -e  '       -D /usr/X11R6/bin/run.exe \' >> /etc/postinstall/singular-icons.sh
     335        @echo -e  '       -d "Start Singular in emacs"' >> /etc/postinstall/singular-icons.sh
    349336        @echo -e  '' >> /etc/postinstall/singular-icons.sh
    350337        @echo -e  '# Singular in rxvt' >> /etc/postinstall/singular-icons.sh
    351338        @echo -e  'mkshortcut -A -a \047-rv -fn "FixedSys" -e /bin/bash --login -i -c Singular\047 \' >> /etc/postinstall/singular-icons.sh
    352         @echo -e  '       -i ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/runTSingular.exe -n "Singular (rxvt)" \' >> /etc/postinstall/singular-icons.sh
     339        @echo -e  '       -i ${CYGWIN_SINGULAR_BIN}/runTSingular.exe -n "Singular (rxvt)" \' >> /etc/postinstall/singular-icons.sh
    353340        @echo -e  '       -D /bin/rxvt -d "Start Singular in a rxvt terminal"' >> /etc/postinstall/singular-icons.sh
    354341        @echo -e  Writing /usr/bin/ESingular
    355342        @echo -e  "#! /bin/bash" > /usr/bin/ESingular
    356         @echo -e  "${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/ESingular.exe \$$*" >> /usr/bin/ESingular
     343        @echo -e  "export SINGULAR_BIN_DIR=${CYGWIN_SINGULAR_BIN}" >> /usr/bin/ESingular
     344        @echo -e  "export SINGULAR_ROOT_DIR=${CYGWIN_SINGULAR_ROOT}" >> /usr/bin/ESingular
     345        @echo -e  "export SINGULAR_INFO_FILE=${CYGWIN_SINGULAR_DOC}/info/singular.hlp" >> /usr/bin/ESingular
     346        @echo -e  "export SINGULAR_IDX_FILE=${CYGWIN_SINGULAR_DOC}/doc/singular.idx" >> /usr/bin/ESingular
     347        @echo -e  "export SINGULAR_HTML_DIR=${CYGWIN_SINGULAR_DOC}/html" >> /usr/bin/ESingular
     348        @echo -e  "export SINGULAR_CHM_FILE=${CYGWIN_SINGULAR_DOC}/doc/Manual.chm" >> /usr/bin/ESingular
     349        @echo -e  "export SINGULAR_EXAMPLES_DIR=${CYGWIN_SINGULAR_DOC}/examples" >> /usr/bin/ESingular
     350        @echo -e  'export PATH="${CYGWIN_SINGULAR_BIN}:/usr/X11R6/bin:$$PATH"' >> /usr/bin/ESingular
     351        @echo -e  'if [ -z $$DISPLAY ]; then export DISPLAY=:0.0; fi' >> /usr/bin/ESingular
     352        @echo -e  "${CYGWIN_SINGULAR_BIN}/ESingular.exe \$$*" >> /usr/bin/ESingular
    357353        @echo -e  Writing /usr/bin/Singular
    358354        @echo -e  "#! /bin/bash" > /usr/bin/Singular
    359         @echo -e  "${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/Singular.exe \$$*" >> /usr/bin/Singular
     355        @echo -e  "export SINGULAR_BIN_DIR=${CYGWIN_SINGULAR_BIN}" >> /usr/bin/Singular
     356        @echo -e  "export SINGULAR_ROOT_DIR=${CYGWIN_SINGULAR_ROOT}" >> /usr/bin/Singular
     357        @echo -e  "export SINGULAR_INFO_FILE=${CYGWIN_SINGULAR_DOC}/info/singular.hlp" >> /usr/bin/Singular
     358        @echo -e  "export SINGULAR_IDX_FILE=${CYGWIN_SINGULAR_DOC}/doc/singular.idx" >> /usr/bin/Singular
     359        @echo -e  "export SINGULAR_HTML_DIR=${CYGWIN_SINGULAR_DOC}/html" >> /usr/bin/Singular
     360        @echo -e  "export SINGULAR_CHM_FILE=${CYGWIN_SINGULAR_DOC}/doc/Manual.chm" >> /usr/bin/Singular
     361        @echo -e  "export SINGULAR_EXAMPLES_DIR=${CYGWIN_SINGULAR_DOC}/examples" >> /usr/bin/Singular
     362        @echo -e  'export PATH="${CYGWIN_SINGULAR_BIN}:$$PATH"' >> /usr/bin/Singular
     363        @echo -e  'if [ -z $$DISPLAY ]; then export DISPLAY=:0.0; fi' >> /usr/bin/Singular
     364        @echo -e  "${CYGWIN_SINGULAR_BIN}/Singular.exe \$$*" >> /usr/bin/Singular
     365
     366
     367cygwin-dist-install: cygwin-dist-scripts ## ${BINDIST_NAME}.tar.gz
     368        if test -d ${TMPDIR}; then rm -fr ${TMPDIR}; fi
     369        ${MKINSTALLDIRS} ${TMPDIR}
     370        tar  --directory=${TMPDIR} -x -z -f ${SHAREDIST_NAME}.tar.gz
     371        -rm -rf ${TMPDIR}/Singular/${S_VERSION}/html
     372        tar  --directory=${TMPDIR} -x -z -f ${BINDIST_NAME}.tar.gz
     373        -rm -rf ${CYGWIN_SINGULAR_ROOT} ${CYGWIN_SINGULAR_DOC} ${CYGWIN_SINGULAR_BIN}
     374        ${MKINSTALLDIRS} ${CYGWIN_SINGULAR_ROOT} ${CYGWIN_SINGULAR_DOC} ${CYGWIN_SINGULAR_BIN}
     375## Copy documentation files
     376        ${MKINSTALLDIRS} /usr/share/doc/Singular-${CYGWIN_PORT_VER}
     377        cp ${TMPDIR}/Singular/${S_VERSION}/README /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
     378        cp ${TMPDIR}/Singular/${S_VERSION}/INSTALL /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
     379        cp ${TMPDIR}/Singular/${S_VERSION}/COPYING /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
     380        cp ${TMPDIR}/Singular/${S_VERSION}/NEWS /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
     381        cp ${TMPDIR}/Singular/${S_VERSION}/GPL /usr/share/doc/Singular-${CYGWIN_PORT_VER}/
     382## Install Cygwin specific structure
     383        mv ${TMPDIR}/Singular/${S_VERSION}/ix86-Win/* ${CYGWIN_SINGULAR_BIN}/
     384        -rmdir ${TMPDIR}/Singular/${S_VERSION}/ix86-Win
     385        mv ${TMPDIR}/Singular/${S_VERSION}/LIB ${CYGWIN_SINGULAR_ROOT}/
     386        mv ${TMPDIR}/Singular/${S_VERSION}/emacs ${CYGWIN_SINGULAR_ROOT}/
     387        mv ${TMPDIR}/Singular/${S_VERSION}/* ${CYGWIN_SINGULAR_DOC}/
     388## Copy auxiliar files
     389        cp ${CYGWIN_AUX_FILES}/surf.exe ${CYGWIN_SINGULAR_BIN}/
     390        cp ${CYGWIN_AUX_FILES}/SURF_AUTHORS ${CYGWIN_SINGULAR_BIN}/
     391        cp ${CYGWIN_AUX_FILES}/SURF_README ${CYGWIN_SINGULAR_BIN}/
     392        cp ${CYGWIN_AUX_FILES}/SURF_COPYING ${CYGWIN_SINGULAR_BIN}/
     393        cp ${CYGWIN_AUX_FILES}/Manual.chm ${CYGWIN_SINGULAR_DOC}/doc
     394        cp ${CYGWIN_AUX_FILES}/startxserver.bat ${CYGWIN_SINGULAR_BIN}/
     395        unix2dos ${CYGWIN_SINGULAR_BIN}/startxserver.bat
     396##      Download setup exe
     397        export http_proxy=http://positron:3128; \
     398        wget http://cygwin.com/setup.exe -O ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe
     399##      or copy from local folder
     400#       cp ${CYGWIN_AUX_FILES}/cygwin-setup.exe ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe
    360401        cp ${CYGWIN_AUX_FILES}/singular-base.README /usr/share/doc/Cygwin/singular-base-${CYGWIN_PORT_VER}.README
    361402        cp ${CYGWIN_AUX_FILES}/singular-share.README /usr/share/doc/Cygwin/singular-share-${CYGWIN_PORT_VER}.README
    … …  
    376417        tar cjf ${CYGWIN_REP_DIR}/release/singular-base/singular-base-${CYGWIN_PORT_VER}.tar.bz2 \
    377418              /usr/share/doc/Cygwin/singular-base-${CYGWIN_PORT_VER}.README \
    378               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/COPYING  \
    379               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/INSTALL  \
    380               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/NEWS     \
    381               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/README   \
     419              /usr/share/doc/Singular-${CYGWIN_PORT_VER}/COPYING  \
     420              /usr/share/doc/Singular-${CYGWIN_PORT_VER}/INSTALL  \
     421              /usr/share/doc/Singular-${CYGWIN_PORT_VER}/NEWS     \
     422              /usr/share/doc/Singular-${CYGWIN_PORT_VER}/README   \
     423              /usr/share/doc/Singular-${CYGWIN_PORT_VER}/GPL   \
    382424              /usr/bin/Singular                  \
    383425              /usr/bin/ESingular                 \
    384               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/*Singular*       \
    385               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/solve_IP.exe     \
    386               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/toric_ideal.exe  \
    387               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/change_cost.exe  \
    388               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/LLL.exe     \
    389               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/libparse.exe     \
    390               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/gen_test.exe
     426              ${CYGWIN_SINGULAR_BIN}/*Singular*       \
     427              ${CYGWIN_SINGULAR_BIN}/solve_IP.exe     \
     428              ${CYGWIN_SINGULAR_BIN}/toric_ideal.exe  \
     429              ${CYGWIN_SINGULAR_BIN}/change_cost.exe  \
     430              ${CYGWIN_SINGULAR_BIN}/LLL.exe          \
     431              ${CYGWIN_SINGULAR_BIN}/libparse.exe     \
     432              ${CYGWIN_SINGULAR_BIN}/gen_test.exe
    391433        tar cjf ${CYGWIN_REP_DIR}/release/singular-share/singular-share-${CYGWIN_PORT_VER}.tar.bz2 \
    392434              /usr/share/doc/Cygwin/singular-share-${CYGWIN_PORT_VER}.README \
    393               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/COPYING  \
    394               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/INSTALL  \
    395               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/NEWS     \
    396               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/README   \
    397               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/emacs    \
    398               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/LIB      \
    399               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/examples
     435              ${CYGWIN_SINGULAR_ROOT}/*
    400436        tar cjf ${CYGWIN_REP_DIR}/release/singular-help/singular-help-${CYGWIN_PORT_VER}.tar.bz2 \
    401437              /usr/share/doc/Cygwin/singular-help-${CYGWIN_PORT_VER}.README \
    402               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/doc      \
    403               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/info
     438              ${CYGWIN_SINGULAR_DOC}/*
    404439        tar cjf ${CYGWIN_REP_DIR}/release/singular-surf/singular-surf-${CYGWIN_PORT_VER}.tar.bz2 \
    405440              /usr/share/doc/Cygwin/singular-surf-${CYGWIN_PORT_VER}.README \
    406               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/surf.exe       \
    407               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/SURF_AUTHORS   \
    408               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/SURF_README    \
    409               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/SURF_COPYING
     441              ${CYGWIN_SINGULAR_BIN}/surf.exe       \
     442              ${CYGWIN_SINGULAR_BIN}/SURF_AUTHORS   \
     443              ${CYGWIN_SINGULAR_BIN}/SURF_README    \
     444              ${CYGWIN_SINGULAR_BIN}/SURF_COPYING
    410445        tar cjf ${CYGWIN_REP_DIR}/release/singular-icons/singular-icons-${CYGWIN_PORT_VER}.tar.bz2  \
    411446              /usr/share/doc/Cygwin/singular-icons-${CYGWIN_PORT_VER}.README \
    412               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/cygwin-setup.exe                \
    413               ${CYGWIN_SINGULAR_BASE}/${CYGWIN_SINGULAR_DIR}/ix86-Win/startxserver.bat                \
     447              ${CYGWIN_SINGULAR_BIN}/cygwin-setup.exe                \
     448              ${CYGWIN_SINGULAR_BIN}/startxserver.bat                \
    414449              /etc/postinstall/singular-icons.sh
    415450        touch ${CYGWIN_REP_DIR}/release/singular-helper/singular-helper-${CYGWIN_PORT_VER}.tar.bz2
    … …  
    468503        @echo >> ${CYGWIN_REP_DIR}/setup.ini
    469504
    470 cygwin-pfw: cygwin-pfw-Full ## cygwin-pfw-Small
     505cygwin-pfw: cygwin-pfw-Small cygwin-pfw-Full
    471506
    472507cygwin-pfw-%:
    … …  
    474509        ${MKINSTALLDIRS} ${TMPDIR}/Files
    475510        cp -r ${CYGWIN_ORIG}/$*/* ${TMPDIR}/Files/
    476         if test "$$*" = Full; then \
     511        @if test "$*" = "Full"; then \
     512          echo "Create Full distribution"; \
    477513          cp -r ${CYGWIN_REP_DIR}/release/singular* ${TMPDIR}/Files/release/; \
    478514        else \
     515          echo "Create Small distribution"; \
    479516          cp -r ${CYGWIN_REP_DIR}/release/singular-base ${TMPDIR}/Files/release/; \
    480517          cp -r ${CYGWIN_REP_DIR}/release/singular-helper ${TMPDIR}/Files/release/; \
    … …  
    485522        -rm -f  ${TMPDIR}/Files/release/singular-base/*src.tar.bz2
    486523        -rm -f  ${TMPDIR}/Files/release/singular-surf/*src.tar.bz2
     524        -rm -f  ${TMPDIR}/Files/setup.exe
     525        cp ${CYGWIN_AUX_FILES}/setup-pfw.exe ${TMPDIR}/Files/setup.exe
    487526        cat ${CYGWIN_REP_DIR}/setup.ini | sed -e 's/setup-version:.*//' | sed -e 's/setup-timestamp:.*//' >> ${TMPDIR}/Files/setup.ini
    488527        @echo Writing Singular.pfw ...
Note: See TracChangeset for help on using the changeset viewer.