diff -Nur wxMotif-2.3.2.orig/Makefile.in wxMotif-2.3.2/Makefile.in
--- wxMotif-2.3.2.orig/Makefile.in	Wed Dec  5 10:34:52 2001
+++ wxMotif-2.3.2/Makefile.in	Sat Dec 22 22:39:23 2001
@@ -379,31 +379,31 @@
 
 
 CREATE_INSTALLED_LINKS: preinstall
-	$(RM) $(libdir)/@WX_LIBRARY_LINK1@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2@
-	cd $(libdir) \
+	$(RM) $(DESTDIR)$(libdir)/@WX_LIBRARY_LINK1@
+	$(RM) $(DESTDIR)$(libdir)/@WX_LIBRARY_LINK2@
+	cd $(DESTDIR)$(libdir) \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@
 
 CREATE_INSTALLED_LINKS_GL: preinstall_gl
-	$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
-	$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
-	cd $(libdir) \
+	$(RM) $(DESTDIR)$(libdir)/@WX_LIBRARY_LINK1_GL@
+	$(RM) $(DESTDIR)$(libdir)/@WX_LIBRARY_LINK2_GL@
+	cd $(DESTDIR)$(libdir) \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
 		&& $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@
 
 afminstall: preinstall
-	@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
-	$(INSTALL) -d $(datadir)/wx
-	$(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
+	@if test ! -d $(DESTDIR)$(datadir); then $(INSTALL) -d $(DESTDIR)$(datadir); fi
+	$(INSTALL) -d $(DESTDIR)$(datadir)/wx
+	$(INSTALL) -d $(DESTDIR)$(datadir)/wx/$(VER_MAJMIN)
+	$(INSTALL) -d $(DESTDIR)$(datadir)/wx/$(VER_MAJMIN)/afm
+	$(INSTALL) -d $(DESTDIR)$(datadir)/wx/$(VER_MAJMIN)/gs_afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(DESTDIR)$(datadir)/wx/$(VER_MAJMIN)/afm
+	$(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/$(VER_MAJMIN)/gs_afm
         
 m4datainstall: preinstall
-	$(INSTALL) -d $(datadir)/aclocal
-	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(datadir)/aclocal
+	$(INSTALL) -d $(DESTDIR)$(datadir)/aclocal
+	$(INSTALL_DATA) $(top_srcdir)/wxwin.m4 $(DESTDIR)$(datadir)/aclocal
 
 # this is the real install target: copies the library, wx-config and the
 # headers to the installation directory
@@ -412,58 +412,58 @@
 	@echo " Installing wxWindows..."
 	@echo " "
 
-	@if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
-	@if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-
-	$(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_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
+	@if test ! -d $(DESTDIR)$(prefix); then $(INSTALL) -d $(DESTDIR)$(prefix); fi
+	@if test ! -d $(DESTDIR)$(bindir); then $(INSTALL) -d $(DESTDIR)$(bindir); fi
+	@if test ! -d $(DESTDIR)$(libdir); then $(INSTALL) -d $(DESTDIR)$(libdir); fi
+
+	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(DESTDIR)$(bindir)/wx@TOOLCHAIN_NAME@-config
+	cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
+	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(DESTDIR)$(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
+		$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(DESTDIR)$(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
 
-	$(INSTALL) -d $(libdir)/wx
-	$(INSTALL) -d $(libdir)/wx/include
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
-	$(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
+	$(INSTALL) -d $(DESTDIR)$(libdir)/wx
+	$(INSTALL) -d $(DESTDIR)$(libdir)/wx/include
+	$(INSTALL) -d $(DESTDIR)$(libdir)/wx/include/@TOOLCHAIN_NAME@
+	$(INSTALL) -d $(DESTDIR)$(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
 	$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
-                    $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
+                    $(DESTDIR)$(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
 
-	$(INSTALL) -d $(includedir)/wx
+	$(INSTALL) -d $(DESTDIR)$(includedir)/wx
 	@# FIXME: This will erroneously install a wx/base dir for wxBase..
-	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
-	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
-	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
-	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(DESTDIR)$(includedir)/wx/@TOOLKIT_DIR@; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(DESTDIR)$(includedir)/wx/html; fi
+	@if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(DESTDIR)$(includedir)/wx/generic; fi
+	@if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(DESTDIR)$(includedir)/wx/msw/ole; fi
 
-	$(INSTALL) -d $(includedir)/wx/protocol
-	$(INSTALL) -d $(includedir)/wx/unix
+	$(INSTALL) -d $(DESTDIR)$(includedir)/wx/protocol
+	$(INSTALL) -d $(DESTDIR)$(includedir)/wx/unix
 	@list='$(HEADERS)'; for p in $$list; do \
-	  $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \
-	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
+	  $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(DESTDIR)$(includedir)/wx/$$p; \
+	  echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(DESTDIR)$(includedir)/wx/$$p"; \
 	done
 
-	@if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
+	@if test ! -d $(localedir); then $(INSTALL) -d $(DESTDIR)$(localedir); fi
 	@for p in $(WX_LINGUAS); do \
-	  if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
-	  if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
-	  $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
-	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
+	  if test ! -d $(DESTDIR)$(localedir)/$$p; then $(INSTALL) -d $(DESTDIR)$(localedir)/$$p; fi;\
+	  if test ! -d $(DESTDIR)$(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(DESTDIR)$(localedir)/$$p/LC_MESSAGES; fi;\
+	  $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(DESTDIR)$(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
+	  echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(DESTDIR)$(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
 	done
 
 preinstall_res: $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@
 	@echo " "
 	@echo " Installing wxWindows Mac resource ..."
 	@echo " "
-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ $(libdir)/@WX_RESOURCES_MACOSX_COMPILED@
+	@if test ! -d $(DESTDIR)$(libdir); then $(INSTALL) -d $(DESTDIR)$(libdir); fi
+	$(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_COMPILED@ $(DESTDIR)$(libdir)/@WX_RESOURCES_MACOSX_COMPILED@
 
 preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@
 	@echo " "
 	@echo " Installing wxWindows OpenGl add-on..."
 	@echo " "
-	@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
-	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
+	@if test ! -d $(DESTDIR)$(libdir); then $(INSTALL) -d $(DESTDIR)$(libdir); fi
+	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(DESTDIR)$(libdir)/@WX_TARGET_LIBRARY_GL@
 
 install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall
 	@echo " "
Binary files wxMotif-2.3.2.orig/contrib/docs/latex/ogl/ogledit.bmp and wxMotif-2.3.2/contrib/docs/latex/ogl/ogledit.bmp differ