Mercurial > mxe-octave

changeset 6183:ad50ef752299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gl2ps: dont install docs to basedir, remove unneeded manual install of files * src/gl2ps-2-docpath.patch: dont set doc dir to . when cross compiling * src/gl2ps.mk: remove unrequired mingw manual install of files
author John Donoghue <john.donoghue@ieee.org>
date Fri, 22 Apr 2022 10:27:33 -0400
parents 71151d858e48
children 4e45e976d7af
files src/gl2ps-2-docpath.patch src/gl2ps.mk
diffstat 2 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/gl2ps-2-docpath.patch	Fri Apr 22 10:24:28 2022 -0400
+++ b/src/gl2ps-2-docpath.patch	Fri Apr 22 10:27:33 2022 -0400
@@ -6,7 +6,7 @@
  endif()
  
 -if(WIN32)
-+if(WIN32 AND NOT DEFINED ENV{MSYSTEM})
++if(WIN32 AND NOT DEFINED ENV{MSYSTEM} AND NOT CMAKE_CROSSCOMPILING)
    set(GL2PS_DOC .)
  else()
    set(GL2PS_DOC share/doc/gl2ps)
--- a/src/gl2ps.mk	Fri Apr 22 10:24:28 2022 -0400
+++ b/src/gl2ps.mk	Fri Apr 22 10:27:33 2022 -0400
@@ -73,12 +73,6 @@
                 $(INSTALL) -m644 '$(1)/gl2ps.h' '$(3)$(HOST_INCDIR)'; \
             else \
                 $(MAKE) -C '$(1)' -j 1 VERBOSE=1 DESTDIR='$(3)' install; \
-                if [ $(MXE_SYSTEM) = mingw ]; then \
-                    echo "Install dll"; \
-                    $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \
-                    $(INSTALL) '$(3)$(HOST_LIBDIR)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \
-                    rm -f '$(3)$(HOST_LIBDIR)/libgl2ps.dll'; \
-                fi; \
             fi
         endef
     else