f22fcf7b70
Tested in a bulk build by (thanks!) and ok sthen@ jasper@. Diff looks alright to steven@.
36 lines
2.1 KiB
Plaintext
36 lines
2.1 KiB
Plaintext
$OpenBSD: patch-utils_wxrc_Makefile_in,v 1.3 2009/09/10 21:23:28 landry Exp $
|
|
--- utils/wxrc/Makefile.in.orig Fri Mar 6 13:11:16 2009
|
|
+++ utils/wxrc/Makefile.in Fri Sep 4 23:57:40 2009
|
|
@@ -70,15 +70,15 @@ WXRC_OBJECTS = \
|
|
@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
|
|
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
|
COND_MONOLITHIC_0___WXLIB_XML_p = \
|
|
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
|
|
@COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
|
|
COND_MONOLITHIC_0___WXLIB_BASE_p = \
|
|
- -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
|
|
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
|
|
@COND_USE_XRC_1@__install_wxrc___depname = install_wxrc
|
|
@COND_USE_XRC_1@__uninstall_wxrc___depname = uninstall_wxrc
|
|
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
|
- -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
|
|
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
|
@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
|
|
@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
|
@@ -116,11 +116,7 @@ distclean: clean
|
|
|
|
@COND_USE_XRC_1@install_wxrc: $(__wxrc___depname)
|
|
@COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
|
|
-@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
|
|
-@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
|
|
-@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
|
|
-@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
|
|
-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
|
|
+@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc
|
|
|
|
@COND_USE_XRC_1@uninstall_wxrc:
|
|
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
|