Mercurial > mxe-octave
changeset 3324:79b4fa46e4dd
Fix building of gl2ps so it doesn't spray files everywhere.
* src/gl2ps-1-fixes.patch: Don't place doc files at the top-level directory.
Put them in share/doc/gl2ps as they should be.
* src/gl2ps.mk: Install dll file to bin directory on MinGW, not lib directory.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 14 Nov 2013 08:15:49 -0800 |
| parents | 808b2c61eccb |
| children | 64f9dbe1d7e7 |
| files | src/gl2ps-1-fixes.patch src/gl2ps.mk |
| diffstat | 2 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/gl2ps-1-fixes.patch Thu Nov 14 08:15:49 2013 -0800 @@ -0,0 +1,15 @@ +--- gl2ps-1.3.8-source/CMakeLists.txt 2012-11-27 11:41:06.000000000 -0800 ++++ gl2ps-1.3.8-mod/CMakeLists.txt 2013-11-14 07:53:29.478371844 -0800 +@@ -125,11 +125,7 @@ + install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX}) + endif(OPENGL_FOUND) + +-if(WIN32) +- set(GL2PS_DOC .) +-else(WIN32) +- set(GL2PS_DOC share/doc/gl2ps) +-endif(WIN32) ++set(GL2PS_DOC share/doc/gl2ps) + + install(FILES gl2ps.h DESTINATION include) + install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
--- a/src/gl2ps.mk Thu Nov 14 07:46:10 2013 -0800 +++ b/src/gl2ps.mk Thu Nov 14 08:15:49 2013 -0800 @@ -59,7 +59,8 @@ if [ $(MXE_SYSTEM) = mingw ]; then \ echo "Install dll"; \ $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \ - $(INSTALL) '$(1)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \ + $(INSTALL) '$(3)$(HOST_LIBDIR)/libgl2ps.dll' '$(3)$(HOST_BINDIR)/'; \ + rm -f '$(3)$(HOST_LIBDIR)/libgl2ps.dll'; \ fi; \ fi endef