Tweaked config for weird static lib BSDism.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -413,8 +413,6 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
|
|||||||
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
|
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
|
||||||
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
|
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
|
||||||
$(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
|
$(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
|
||||||
@if test "@WX_LIBRARY_NAME_STATIC@" = "@WX_TARGET_LIBRARY@"; then $(RANLIB) $(libdir)/@WX_TARGET_LIBRARY@; fi
|
|
||||||
@# this installs the import library for a MSW DLL
|
|
||||||
@if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
|
@if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
|
||||||
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
|
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
|
||||||
|
|
||||||
|
16
configure.in
16
configure.in
@@ -1458,7 +1458,21 @@ AC_CHECK_PROG(AR, ar, ar, ar)
|
|||||||
|
|
||||||
dnl install checks
|
dnl install checks
|
||||||
dnl defines INSTALL with the appropriate command
|
dnl defines INSTALL with the appropriate command
|
||||||
AC_PROG_INSTALL
|
case "${host}" in
|
||||||
|
|
||||||
|
dnl The other BSD's should probably go in here too, since this is
|
||||||
|
dnl to workaround a strange static lib BSDism.
|
||||||
|
powerpc-*-darwin* )
|
||||||
|
INSTALL="cp -p"
|
||||||
|
INSTALL_PROGRAM="cp -p"
|
||||||
|
INSTALL_DATA="cp -p"
|
||||||
|
AC_SUBST(INSTALL)
|
||||||
|
AC_SUBST(INSTALL_PROGRAM)
|
||||||
|
AC_SUBST(INSTALL_DATA)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
esac
|
||||||
|
|
||||||
dnl strip command
|
dnl strip command
|
||||||
dnl defines STRIP as strip or nothing if not found
|
dnl defines STRIP as strip or nothing if not found
|
||||||
|
Reference in New Issue
Block a user