Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved wx-config to wx-config-VERSION (with symlink), to satisfy Debian packagers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-11 20:37:33 +00:00
parent 7a47e45ecc
commit 4b167aca0c
3 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/wx.bkl
View File

@@ -67,7 +67,8 @@
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
$(INSTALL_PROGRAM) lib/wx/config/@WXCONFIG_DATA_FILE@ $(DESTDIR)$(LIBDIR)/wx/config
(cd $(DESTDIR)$(LIBDIR)/wx/config && rm -f $(TOOLCHAIN_NAME) && $(LN_S) @WXCONFIG_DATA_FILE@ $(TOOLCHAIN_NAME))
$(INSTALL_PROGRAM) wx-config $(DESTDIR)$(BINDIR)
$(INSTALL_PROGRAM) wx-config-$(WXVER_MAJOR).$(WXVER_MINOR) $(DESTDIR)$(BINDIR)
(cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) wx-config-$(WXVER_MAJOR).$(WXVER_MINOR) wx-config)
(cd $(DESTDIR)$(BINDIR) && rm -f wx$(TOOLCHAIN_NAME)-config && $(LN_S) wx-config wx$(TOOLCHAIN_NAME)-config)
</command>
</action>

30
configure vendored
View File

@@ -39557,14 +39557,10 @@ fi
BAKEFILE_BAKEFILE_M4_VERSION="0.1.4"
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
# Check whether --enable-precomp-headers or --disable-precomp-headers was given.
if test "${enable_precomp_headers+set}" = set; then
enableval="$enable_precomp_headers"
@@ -39823,7 +39819,6 @@ EOF
COND_BUILD_DEBUG="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILD_DEBUG=""
@@ -40574,6 +40569,16 @@ EOF
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
fi
COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
fi
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_GUI_1=""
@@ -41844,6 +41849,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}"
WX_RELEASE="${WX_RELEASE}"
LN_S="${LN_S}"
@@ -42865,18 +42871,20 @@ echo "$as_me: executing $ac_dest commands" >&6;}
mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
fi
if test -f wx-config; then
if test ! -h wx-config; then
chmod +x wx-config
mv -f wx-config lib/wx/config/${WXCONFIG_DATA_FILE}
( cd lib/wx/config ;
rm -f ${TOOLCHAIN_NAME}
${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
${LN_S} wx-config-${WX_RELEASE} wx-config
fi
( cd lib/wx/config ;
rm -f ${TOOLCHAIN_NAME}
${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
if test -f wx-config-wrapper; then
chmod +x wx-config-wrapper
mv -f wx-config-wrapper wx-config
mv -f wx-config-wrapper wx-config-${WX_RELEASE}
rm -f wx${TOOLCHAIN_NAME}-config
${LN_S} wx-config wx${TOOLCHAIN_NAME}-config
${LN_S} wx-config-${WX_RELEASE} wx${TOOLCHAIN_NAME}-config
fi
;;
esac

22
configure.in
View File

@@ -6292,23 +6292,33 @@ AC_CONFIG_COMMANDS([default],
mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
fi
if test -f wx-config; then
dnl This test is required to make the following idempotent.
dnl Otherwise running config.status or rerunning configure
dnl would stomp the wx-config link or try to move it onto
dnl itself.
dnl Use -h instead of -L to test for link (GD)
dnl -h is documented as obsolete under Mac OS X but works
dnl -L is obsolete under Solaris8
if test ! -h wx-config; then
chmod +x wx-config
mv -f wx-config lib/wx/config/${WXCONFIG_DATA_FILE}
( cd lib/wx/config ;
rm -f ${TOOLCHAIN_NAME}
${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
${LN_S} wx-config-${WX_RELEASE} wx-config
fi
( cd lib/wx/config ;
rm -f ${TOOLCHAIN_NAME}
${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
if test -f wx-config-wrapper; then
chmod +x wx-config-wrapper
mv -f wx-config-wrapper wx-config
mv -f wx-config-wrapper wx-config-${WX_RELEASE}
rm -f wx${TOOLCHAIN_NAME}-config
${LN_S} wx-config wx${TOOLCHAIN_NAME}-config
${LN_S} wx-config-${WX_RELEASE} wx${TOOLCHAIN_NAME}-config
fi
],
[
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}"
WX_RELEASE="${WX_RELEASE}"
LN_S="${LN_S}"
]
)