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

- change to /usr/share/wx/version

Browse Source 
- do not set executable flag for .a libraries


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-11-22 00:29:57 +00:00
parent 406e3e0d0d
commit 65eb985502
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.in
View File

@@ -114,6 +114,7 @@ INTLDIR = $(WXDIR)/locale
########################## Archive name ############################### ########################## Archive name ###############################
# append a version suffix x.y.z to all file names # append a version suffix x.y.z to all file names
VER_MAJMIN=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)
VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER) VER_SUFFIX=$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)$(EXTRA_VER)
WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
@@ -394,10 +395,11 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
afminstall: preinstall afminstall: preinstall
@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
$(INSTALL) -d $(datadir)/wx $(INSTALL) -d $(datadir)/wx
$(INSTALL) -d $(datadir)/wx/afm $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
$(INSTALL) -d $(datadir)/wx/gs_afm $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
# this is the real install target: copies the library, wx-config and the # this is the real install target: copies the library, wx-config and the
# headers to the installation directory # headers to the installation directory
@@ -412,7 +414,7 @@ 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_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@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
@@ -457,7 +459,7 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
@echo " Installing wxWindows OpenGl add-on..." @echo " Installing wxWindows OpenGl add-on..."
@echo " " @echo " "
@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
$(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
install: @AFMINSTALL@ @WX_ALL_INSTALLED@ install: @AFMINSTALL@ @WX_ALL_INSTALLED@
@echo " " @echo " "