You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.8 KiB
42 lines
1.8 KiB
This file is part of MXE. See LICENSE.md for licensing information.
|
|
|
|
Contains ad hoc patches for cross building.
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
Date: Sat, 21 Nov 2015 15:38:02 +1100
|
|
Subject: [PATCH 1/1] fix dll install directory
|
|
|
|
Taken from:
|
|
https://github.com/beltoforion/muparser/pull/17
|
|
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 1111111..2222222 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -29,6 +29,7 @@ BK_DEPS = @BK_DEPS@
|
|
srcdir = @srcdir@
|
|
top_builddir = @top_builddir@
|
|
libdir = @libdir@
|
|
+dlldir = @dlldir@
|
|
DLLPREFIX = @DLLPREFIX@
|
|
LIBS = @LIBS@
|
|
AR = @AR@
|
|
@@ -266,13 +267,14 @@ distclean: clean
|
|
|
|
@COND_SHARED_1@install_muParser_dll: $(__muParser_dll___depname)
|
|
@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
|
|
+@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(dlldir)
|
|
@COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)muparser$(DEBUG_BUILD_POSTFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
|
|
-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3) $(DESTDIR)$(libdir)
|
|
+@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3) $(DESTDIR)$(dlldir)
|
|
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__muParser_dll___so_symlinks_inst_cmd))
|
|
|
|
@COND_SHARED_1@uninstall_muParser_dll:
|
|
@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)muparser$(DEBUG_BUILD_POSTFIX).$(DLLIMP_SUFFIX)
|
|
-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3)
|
|
+@COND_SHARED_1@ rm -f $(DESTDIR)$(dlldir)/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3)
|
|
@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__muParser_dll___so_symlinks_uninst_cmd))
|
|
|
|
@COND_SHARED_1@install_muParser_dll_headers:
|