From e0ea79b8056a8760e765bc056df2e4667b43638a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 29 Jul 2012 08:52:52 +0000 Subject: [PATCH] Fix installed wx-config broken by r72205. In an attempt to fix DESTDIR support on platforms without symbolic links, this commit completely broke the wx-config symlink created by "make install" everywhere (unless you were insane enough to use "--prefix=/", that is): $(libdir) is absolute path and so using ../$(libdir) has no chance of working. Fixed by using `basename $(libdir)`. This is still unsatisfactory, because it assumes that $(libdir) and $(bindir) are at the same level in the filesystem -- which, while usually true, is by no means guaranteed. But at least this works most of the time. See #14517. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 2 +- build/bakefiles/wx.bkl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index dea5e588c5..3ac4850d5d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15785,7 +15785,7 @@ install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config - (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 63f15c9ab6..11a5aa23fe 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -97,7 +97,7 @@ $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config - (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) ../$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + (cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) ../`basename $(LIBDIR)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -- 2.45.2