* Enable man2ps to work without hard-coding the locations of groff or dpost.

[lyx.git] / development / Win32 / packaging / package_lyxwin.sh

diff --git a/development/Win32/packaging/package_lyxwin.sh b/development/Win32/packaging/package_lyxwin.sh
index e8ec1cbd40382d1bf136f4abea28b4738067cb91..5a20d2890f2c58e9075d6e054b3328fe4a5feedb 100644 (file)
--- a/development/Win32/packaging/package_lyxwin.sh
+++ b/development/Win32/packaging/package_lyxwin.sh
@@ -5,15 +5,14 @@
 
 # It copies these files into the appropriate places in the LyX tree.
 #   qt-mt3.dll
-#   libiconv-2.dll
+#   iconv.dll
 #   mingw10.dll
-#   clean_dvi.py
 #   dv2dt.exe
 #   dt2dv.exe
 
 # It strips the executables.
 
-# It adds formats and converters to the Resources/lyx/configure script to
+# It adds formats and converters to the Resources/configure script to
 # ensure that the generated .dvi file is usable.
 
 # It removes all stuff generated by running configure:
@@ -25,10 +24,9 @@
 
 # The installee should regenerate them by running configure on his machine.
 
-QT_DLL="$HOME/qt3/bin/qt-mt3.dll"
-LIBICONV_DLL="/j/MinGW/bin/libiconv-2.dll"
+QT_DLL="$HOME/Qt/3x-msys/bin/qt-mt3.dll"
+ICONV_DLL="/j/MinGW/bin/iconv.dll"
 MINGW_DLL="/j/MinGW/bin/mingwm10.dll"
-CLEAN_DVI_PY="clean_dvi.py"
 DTL_DIR=dtl
 DT2DV="$DTL_DIR/dt2dv.exe"
 DV2DT="$DTL_DIR/dv2dt.exe"
@@ -41,8 +39,8 @@ MV='mv -f'
 
 windows_packaging()
 {
-    # Install the necessary .dlls and clean_dvi stuff.
-    for file in "${QT_DLL}" "${LIBICONV_DLL}" "${MINGW_DLL}" "${DT2DV}" "${DV2DT}"
+    # Install the necessary .dlls.
+    for file in "${QT_DLL}" "${ICONV_DLL}" "${MINGW_DLL}" "${DT2DV}" "${DV2DT}"
     do
       cp "${file}" "$LYX_INSTALL_DIR"/bin/. || {
          echo "Failed to copy ${file} to the LyX package" >&2
@@ -50,11 +48,6 @@ windows_packaging()
       }
     done
 
-    cp "${CLEAN_DVI_PY}" "$LYX_INSTALL_DIR"/Resources/lyx/scripts/. || {
-       echo "Failed to copy ${CLEAN_DVI_PY} to the LyX package" >&2
-       exit 1
-    }
-
     # Strip the executables
     (
        cd "${LYX_INSTALL_DIR}/bin"
@@ -64,39 +57,9 @@ windows_packaging()
        done
     )
 
-    # Modify the configure script,
-    # * add a dvi2 format
-    # * change the latex->dvi converter to latex->dvi2
-    # * add a dvi2->dvi converter
-    # * fix the generated chkconfig.sed so that it works with versions of
-    #   sed that get confused by sed scripts with DOS line endings.
-    TMP=tmp.$$
-    CONFIGURE="${LYX_INSTALL_DIR}"/Resources/lyx/configure
-    # Do this to make it easy to compare the before and after files.
-    dos2unix "${CONFIGURE}"
-    sed '
-# (Note that this sed script contains TAB characters.)
-# Append the dvi2 format after the dvi format.
-/^ *\\\\Format[         ]\{1,\}dvi[     ]\{1,\}/a\
-\\\\Format dvi2          dvi   DraftDVI        ""
-
-# Change the latex->dvi converter to latex->dvi2
-# and append the dvi2->dvi converter
-/^ *\\\\converter[      ]\{1,\}latex[   ]\{1,\}dvi[     ]\{1,\}/{
-s/dvi/dvi2/
-a\
-\\\\converter dvi2 dvi "python \\\$\\\$s/scripts/clean_dvi.py \\\$\\\$i \\\$\\\$o" ""
-}
-' "${CONFIGURE}" > "${TMP}"
-    cmp -s "${CONFIGURE}" "${TMP}" || {
-       diff -u "${CONFIGURE}" "${TMP}"
-       ${MV} "${TMP}" "${CONFIGURE}"
-    }
-    rm -f "${TMP}"
-
     # Strip the executables
     (
-       cd "${LYX_INSTALL_DIR}/Resources/lyx"
+       cd "${LYX_INSTALL_DIR}/Resources"
        rm -rf xfonts
        for file in doc/LaTeXConfig.lyx lyxrc.defaults packages.lst textclass.lst
        do