fixed wxTE_LINESCROLL definition to not conflict with wxTE_PROCESS_ENTER

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 353b3a6faded6d1106e03005f6e7501a9468dc08..ddb8121778e129dff2b05173274f4e176f73c6b0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,6 +114,7 @@ INTLDIR  = $(WXDIR)/locale
 ########################## Archive name ###############################
 
 # 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)
 WXARCHIVE=@DISTDIR@-$(VER_SUFFIX).tar.gz
 WXGLARCHIVE=@DISTDIR@-gl-$(VER_SUFFIX).tar.gz
@@ -394,10 +395,15 @@ CREATE_INSTALLED_LINKS_GL: preinstall_gl
 afminstall: preinstall
        @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
        $(INSTALL) -d $(datadir)/wx
-       $(INSTALL) -d $(datadir)/wx/afm
-       $(INSTALL) -d $(datadir)/wx/gs_afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
-       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm
+       $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/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
+        
+m4datainstall: preinstall
+       $(INSTALL) -d $(datadir)/aclocal
+       $(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
@@ -412,7 +418,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
        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 \
                $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
 
@@ -457,9 +463,9 @@ preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
        @echo " Installing wxWindows OpenGl add-on..."
        @echo " "
        @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@ m4datainstall
        @echo " "
        @echo " The installation of wxWindows is finished.  On certain"
        @echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@@ -524,6 +530,7 @@ uninstall:
 ALL_DIST: distclean
        mkdir _dist_dir
        mkdir $(DISTDIR)
+       cp $(WXDIR)/wxwin.m4 $(DISTDIR)
        cp $(WXDIR)/aclocal.m4 $(DISTDIR)
        cp $(WXDIR)/configure.in $(DISTDIR)
        cp $(WXDIR)/configure $(DISTDIR)
@@ -1452,7 +1459,7 @@ cleanall: clean
 
 RPMTOP=_dist_dir/_rpm_top
 
-rpm: dist
+rpm: bzip-dist
        @echo "*** Building RPMs ***"
        -mkdir $(RPMTOP)
        -mkdir $(RPMTOP)/SOURCES
@@ -1460,7 +1467,7 @@ rpm: dist
        -mkdir $(RPMTOP)/BUILD
        -mkdir $(RPMTOP)/RPMS
        -mkdir $(RPMTOP)/SRPMS
-       cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES
+       cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
        rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
        mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` .