Changeset ec146d in git

Timestamp:

Nov 5, 2008, 10:29:28 AM (15 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0a64b14307b6373414c815af6a28b4efad0e4337

Parents:

1fa563ab5084a740927ef512c88676d8cdb652a8

Message:

Cygwin Akutalisierungen


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

File:

• Makefile.in (modified) (3 diffs)

Makefile.in

@@ -438 +438 @@
         @echo -e  '    allargs=$$*' >> /usr/bin/surfex
         @echo -e  'fi' >> /usr/bin/surfex
+        @echo -e  'echo "$$PWD" | sed -e "s/ /\ /g" > $$tmp_dir/tmp.$$$$.txt' >> /usr/bin/surfex
+        @echo -e  'read surfexstartdir <$$tmp_dir/tmp.$$$$.txt' >> /usr/bin/surfex
         @echo -e  '/bin/rm -f $$tmp_dir/tmp.$$$$.txt' >> /usr/bin/surfex
         @echo -e  'cd "$$surfex_dir"' >> /usr/bin/surfex
-        @echo -e  'java surfex -d "$$surfex_dir" -t "$$tmp_dir" $$allargs' >> /usr/bin/surfex
+        @echo -e  'java -jar surfex.jar -d "$$surfexstartdir" -t "$$tmp_dir" $$allargs' >> /usr/bin/surfex
 
 cygwin-dist-install: cygwin-dist-scripts ## ${BINDIST_NAME}.tar.gz
@@ -459 +461 @@
         -rm -rf /lib/surfex
         mv ${TMPDIR}/Singular/${S_VERSION}/LIB/surfex /lib/surfex
+        -mv -u ${TMPDIR}/Singular/${S_VERSION}/LIB/surfex.jar /lib/surfex/surfex.jar
         mv ${TMPDIR}/Singular/${S_VERSION}/ix86-Win/* ${CYGWIN_SINGULAR_BIN}/
         -rmdir ${TMPDIR}/Singular/${S_VERSION}/ix86-Win
@@ -561 +564 @@
         @echo "setup-version: ${CYGWIN_SETUP_VER}" >> ${CYGWIN_REP_DIR}/setup.ini
         @echo >> ${CYGWIN_REP_DIR}/setup.ini
-        cat ${CYGWIN_AUX_FILES}/setup.ini ${CYGWIN_REP_DIR}/setup.ini
+        if test -f ${CYGWIN_ORIG}/Small/setup.ini; then                             \
+                tail -n +7 ${CYGWIN_ORIG}/Small/setup.ini >> ${CYGWIN_REP_DIR}/setup.ini;  \
+        else                                                                        \
+                tail -n +7 ${CYGWIN_ORIG}/Full/setup.ini >> ${CYGWIN_REP_DIR}/setup.ini;   \
+        fi;
         @echo >> ${CYGWIN_REP_DIR}/setup.ini
 ##      Download setup exe