diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in --- dx-4.4.4/bin/dx.in.r 2004-05-31 18:12:05.000000000 +0200 +++ dx-4.4.4/bin/dx.in 2009-11-06 11:47:32.190944177 +0100 @@ -60,14 +60,7 @@ exit 1 # longhelp() { -if test -f "$dxroot/man/catl/dx.l" ; then - more "$dxroot/man/catl/dx.l" -else - echo "cannot find $dxroot/man/catl/dx.l" - echo "set the DXROOT environment variable to the root of the" - echo "dx installation tree and try again." -fi -exit 1 +man dx cat << EOFlonghelp command line parameters: @@ -286,7 +279,7 @@ fi if [ -z "$DXROOT" ]; then - prefix=@prefix@ + prefix=@datadir@ DXROOT=$prefix/dx fi export DXROOT @@ -298,6 +291,13 @@ if [ -z "$DXDATA" ]; then fi fi +if [ -z "$DXFONTS" ]; then + DXFONTS=$DXROOT/fonts + if [ -d "$DXFONTS" ]; then + export DXFONTS + fi +fi + # if DXMACROS not set, default it to the usual unless dir doesn't exist if [ -z "$DXMACROS" ]; then DXMACROS=$DXROOT/samples/macros @@ -507,7 +507,7 @@ export DXARCH # default to running locally, from @prefix@/dx exhost=$thishost -dxroot=@prefix@/dx +dxroot=@datadir@/dx startup=1 # run the startup window by default @@ -1469,8 +1469,8 @@ done # Now set some needed results -dxexroot=$dxroot -dxuiroot=$dxroot +dxexroot=@libdir@/dx +dxuiroot=@libdir@/dx dxexecdef="$dxexroot/bin_${exarch}/dxexec" if test -z "$dxexec" ; then dxexec=$dxexecdef @@ -1600,7 +1600,7 @@ fi # if test $tutor -eq 1 ; then - cmd="$DXROOT/bin_${uiarch}/tutor" + cmd="$DXEXECROOT/bin_${uiarch}/tutor" if test $seecomline -eq 1 ; then set echo "$echoparms exec $cmd $xparms" @@ -1619,7 +1619,7 @@ if test $prompter -eq 1 ; then prompterflags="$prompterflags -file \"$FileName\"" fi - cmd="$DXROOT/bin_${uiarch}/prompter" + cmd="$DXEXECROOT/bin_${uiarch}/prompter" if test $seecomline -eq 1 ; then set echo "$echoparms exec $cmd $prompterflags $xparms" @@ -1635,7 +1635,7 @@ fi if test $startup -eq 1 ; then - cmd="$DXROOT/bin_${uiarch}/startupui" + cmd="$DXEXECROOT/bin_${uiarch}/startupui" if test $seecomline -eq 1 ; then set echo "$echoparms exec $cmd $xparms $*" @@ -1649,7 +1649,7 @@ fi # if test $builder -eq 1 ; then - cmd="$DXROOT/bin_${uiarch}/builder" + cmd="$DXEXECROOT/bin_${uiarch}/builder" if test $seecomline -eq 1 ; then set echo "exec $cmd $xparms $motifcmd $motifbind $FileName" @@ -1674,7 +1674,7 @@ if test $encoder -eq 1 ; then EncodedBase="${Base}-e" echo "Creating encoded version of $FileName in ${EncodedBase}.net " - cmd1="$DXROOT/bin_${uiarch}/dxencode" + cmd1="$DXEXECROOT/bin_${uiarch}/dxencode" if test -f $CfgName ; then echo "Copying $CfgName to ${EncodedBase}.cfg" cmd2="cp $CfgName ${EncodedBase}.cfg" diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am --- dx-4.4.4/bin/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 +++ dx-4.4.4/bin/Makefile.am 2009-11-06 11:47:32.192943219 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -dxbindir = $(prefix)/dx/bin +dxbindir = $(libdir)/dx/bin bindir = $(prefix)/bin EXTRA_SCRIPTS = mdf2c dx diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in --- dx-4.4.4/bin/mdf2c.in.r 1999-12-14 05:13:04.000000000 +0100 +++ dx-4.4.4/bin/mdf2c.in 2009-11-06 11:47:32.194943239 +0100 @@ -1,6 +1,6 @@ #!/bin/sh # Configure is looking for the following line -prefix=@prefix@ +prefix=@datadir@ DFLTROOT=$prefix/dx root=${DXROOT=${DXEXECROOT=$DFLTROOT}} diff -up dx-4.4.4/bin/url_handler.sh.r dx-4.4.4/bin/url_handler.sh --- dx-4.4.4/bin/url_handler.sh.r 2002-04-11 01:32:54.000000000 +0200 +++ dx-4.4.4/bin/url_handler.sh 2009-11-06 11:47:32.195942515 +0100 @@ -39,8 +39,8 @@ case $method in if [ $use_xbrowser = n ]; then lynx "$url" else - netscape -remote "openURL($url)" 2> /dev/null || \ - (netscape "$url" &) + firefox -remote "openURL($url)" 2> /dev/null || \ + (firefox "$url" &) fi ;; esac diff -up dx-4.4.4/configure.ac.r dx-4.4.4/configure.ac --- dx-4.4.4/configure.ac.r 2006-08-21 23:56:08.000000000 +0200 +++ dx-4.4.4/configure.ac 2009-11-06 12:00:44.912941875 +0100 @@ -218,6 +218,7 @@ AC_DEFINE_UNQUOTED(BSH, "$bsh_path", [Pa dnl End of command line options configuration dnl Start DX configuration +AC_PROG_CXX AC_LANG([C++]) AC_CHECK_HEADERS(stdlib.h) AC_LANG([C]) @@ -677,7 +678,7 @@ if test "$ARCH" = "intelnt" ; then fi dnl -- check for unix else - AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg ]) + AC_CHECK_LIB(df,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,[ -lz -ljpeg -L$libdir/hdf ]) AC_MSG_CHECKING(if HDF package is complete) if test $passed -gt 0 then @@ -686,7 +687,7 @@ else AC_MSG_RESULT(no -- some components failed test) have_hdf='no (failed tests)' else - LIB_HDF='-ldf' + LIB_HDF="-ldf -L$libdir/hdf" LIBS="$LIB_HDF $LIBS" FMT_LIBS="$FMT_LIBS libdf.a" AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries]) @@ -801,6 +802,9 @@ then failed=0; passed=0; + CFLAGS="$CFLAGS -I/usr/include/ImageMagick" + CXXFLAGS="$CXXFLAGS -I/usr/include/ImageMagick" + CPPFLAGS="$CPPFLAGS -I/usr/include/ImageMagick" AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) if test "$ARCH" = "intelnt" ; then AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) @@ -835,8 +839,8 @@ dnl routine. This allows us to simplify dnl format configuration libraries. if test "$HAVE_MC" = "yes" ; then - LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`" - AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) + LIB_MAGICK="`MagickCore-config --ldflags` `MagickCore-config --libs`" + AC_CHECK_LIB(MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ]) AC_MSG_CHECKING(if ImageMagick package is complete) if test $passed -gt 0 then @@ -846,8 +850,8 @@ dnl format configuration libraries. have_magick='no (failed tests)' else dnl CFLAGS="`Magick-config --cflags` $CFLAGS" - CPPFLAGS="`Magick-config --cppflags` $CPPFLAGS" - LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-config --libs`" + CPPFLAGS="`MagickCore-config --cppflags` $CPPFLAGS" + LIB_MAGICK="$LIBS `MagickCore-config --ldflags` `MagickCore-config --libs`" dnl UNIQUIFY will remove duplicate library tokens leaving the last instance. AC_UTILS_UNIQUIFY($LIB_MAGICK, LIBS) FMT_LIBS="$FMT_LIBS libMagick.a" @@ -1011,7 +1015,7 @@ DX_CHECK_HEADERS( \ Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \ Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \ gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \ - linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ + linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \ sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \ sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \ diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am --- dx-4.4.4/doc/Makefile.am.r 1999-04-05 13:57:03.000000000 +0200 +++ dx-4.4.4/doc/Makefile.am 2009-11-06 11:47:32.203697175 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -docdir = $(prefix)/dx/doc +docdir = $(datadir)/dx/doc doc_DATA = \ README README_SMP README_alphax README_aviion README_hp700 \ diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am --- dx-4.4.4/fonts/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 +++ dx-4.4.4/fonts/Makefile.am 2009-11-06 11:47:32.204697430 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -fontdir = $(prefix)/dx/fonts +fontdir = $(datadir)/dx/fonts font_DATA = \ README area.dx cyril_d.dx \ diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am --- dx-4.4.4/help/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200 +++ dx-4.4.4/help/Makefile.am 2009-11-06 11:47:32.206696961 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -helpdir = $(prefix)/dx/help +helpdir = $(datadir)/dx/help EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \ $(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \ @@ -257,7 +257,7 @@ install-data-hook: $(LN_S) hlpalhtl svsmstrh ; \ $(LN_S) hlpalhtl ugidx ; \ $(LN_S) hlpalhtl usrefidx ; \ - $(LN_S) HelpDir GarHelpDir ; \ + $(LN_S) HelpDir GARHelpDir ; \ $(LN_S) HelpDir MBHelpDir ; \ echo "cd $(DESTDIR)$(helpdir)" ; \ echo "$(LN_S) hlpalhtl mbidx" ; \ @@ -265,6 +265,6 @@ install-data-hook: echo "$(LN_S) hlpalhtl svsmstrh" ; \ echo "$(LN_S) hlpalhtl ugidx" ; \ echo "$(LN_S) hlpalhtl usrefidx" ; \ - echo "$(LN_S) HelpDir GarHelpDir" ; \ + echo "$(LN_S) HelpDir GARHelpDir" ; \ echo "$(LN_S) HelpDir MBHelpDir" ) \ ' diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am --- dx-4.4.4/html/images/Makefile.am.r 2002-04-01 10:51:13.000000000 +0200 +++ dx-4.4.4/html/images/Makefile.am 2009-11-06 11:47:32.214944415 +0100 @@ -1,5 +1,5 @@ -imagesdir = $(prefix)/dx/html/images +imagesdir = $(datadir)/dx/html/images images1 = \ 3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \ diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am --- dx-4.4.4/html/Makefile.am.r 2003-07-12 02:11:39.000000000 +0200 +++ dx-4.4.4/html/Makefile.am 2009-11-06 11:47:32.216944434 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -htmldir = $(prefix)/dx/html +htmldir = $(datadir)/dx/html SUBDIRS = pages images diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am --- dx-4.4.4/html/pages/Makefile.am.r 2002-06-20 06:38:03.000000000 +0200 +++ dx-4.4.4/html/pages/Makefile.am 2009-11-06 11:47:32.217945666 +0100 @@ -1,4 +1,4 @@ -pagesdir = $(prefix)/dx/html/pages +pagesdir = $(datadir)/dx/html/pages pages1 = \ insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \ diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am --- dx-4.4.4/include/dx/Makefile.am.r 1999-05-26 01:35:16.000000000 +0200 +++ dx-4.4.4/include/dx/Makefile.am 2009-11-06 11:47:32.222944494 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -dxincdir = $(prefix)/dx/include/dx +dxincdir = $(prefix)/include/dx dxinc_HEADERS = \ UserInteractors.h advanced.h arch.h array.h arrayhandles.h \ diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am --- dx-4.4.4/include/Makefile.am.r 2006-04-09 05:44:49.000000000 +0200 +++ dx-4.4.4/include/Makefile.am 2009-11-06 11:47:32.224942558 +0100 @@ -1,4 +1,4 @@ -dxincdir = $(prefix)/dx/include +dxincdir = $(prefix)/include SUBDIRS = dx dxinc_HEADERS = dxl.h dxstereo.h nodist_dxinc_HEADERS = dxconfig.h diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am --- dx-4.4.4/lib/Makefile.am.r 2003-08-22 01:22:13.000000000 +0200 +++ dx-4.4.4/lib/Makefile.am 2009-11-06 11:47:32.225944279 +0100 @@ -1,4 +1,4 @@ -libsdir = $(prefix)/dx/lib +libsdir = $(datadir)/dx/lib libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \ dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am --- dx-4.4.4/man/Makefile.am.r 1999-04-03 18:31:28.000000000 +0200 +++ dx-4.4.4/man/Makefile.am 2009-11-06 11:47:32.227944298 +0100 @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = manl catl +SUBDIRS = manl diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am --- dx-4.4.4/man/manl/Makefile.am.r 2002-05-20 06:47:06.000000000 +0200 +++ dx-4.4.4/man/manl/Makefile.am 2009-11-06 11:47:32.228944553 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -mandir = $(prefix)/dx/man +mandir = $(datadir)/man man_MANS = dx.l EXTRA_DIST = $(man_MANS) diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefile.am --- dx-4.4.4/src/exec/dxexec/Makefile.am.r 2006-01-11 17:24:39.000000000 +0100 +++ dx-4.4.4/src/exec/dxexec/Makefile.am 2009-11-06 11:47:32.229944807 +0100 @@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la libDXEXEC_la_SOURCES = main.c libDXEXEC_la_CFLAGS = $(AM_CFLAGS) -bindir = $(prefix)/dx/bin_@ARCH@ +bindir = $(libdir)/dx/bin_@ARCH@ bin_PROGRAMS = dxexec dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \ diff -up dx-4.4.4/src/exec/dxmods/local.mk.in.r dx-4.4.4/src/exec/dxmods/local.mk.in --- dx-4.4.4/src/exec/dxmods/local.mk.in.r 2003-07-12 02:12:06.000000000 +0200 +++ dx-4.4.4/src/exec/dxmods/local.mk.in 2009-11-06 11:47:32.231945316 +0100 @@ -14,23 +14,23 @@ user.c: dx.mdf dxcm.mdf: ${srcdir}/dxmdf.src -rm -f dxcm.mdf - cp ${srcdir}/dxmdf.src tmp.c - $(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf - -rm -f tmp.c + cp ${srcdir}/dxmdf.src dxcm.tmp.c + $(CPP) $(INCLUDES) $(MDF) $(DEFS) dxcm.tmp.c > dxcm.mdf + -rm -f dxcm.tmp.c dx.mdf: ${srcdir}/dxmdf.src echo MYINC: $(MYINC) -rm -f dx.mdf - cp ${srcdir}/dxmdf.src tmp.c - $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf + cp ${srcdir}/dxmdf.src dx.tmp.c + $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS dx.tmp.c > dx.mdf @echo '/^ *$$/{' > stripl.sed @echo 'N' >> stripl.sed @echo '/^ *\\n *$$/D' >> stripl.sed @echo '}' >> stripl.sed - cat dx.mdf |sed '/^#/d' > tmp.mdf - cat tmp.mdf |sed -f stripl.sed > dx.mdf - @rm -f stripl.sed tmp.mdf - -rm -f tmp.c + cat dx.mdf |sed '/^#/d' > dx.tmp.mdf + cat dx.tmp.mdf |sed -f stripl.sed > dx.mdf + @rm -f stripl.sed dx.tmp.mdf + -rm -f dx.tmp.c .y.h: $(YACC) $(YFLAGS) -d ${srcdir}/$*.y diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefile.am --- dx-4.4.4/src/exec/dxmods/Makefile.am.r 2003-08-19 00:51:10.000000000 +0200 +++ dx-4.4.4/src/exec/dxmods/Makefile.am 2009-11-06 11:47:32.233940447 +0100 @@ -1,8 +1,9 @@ ## Process this file with automake to produce Makefile.in INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D@ARCH@ +INCLUDES+= -I/usr/include/netcdf -dxmdfdir = $(prefix)/dx/lib +dxmdfdir = $(datadir)/dx/lib noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la SUFFIXES = .c .y .c .s .h .o @@ -13,6 +14,8 @@ DISTCLEANFILES = dx.mdf dxcm.mdf user.c dxmdf_DATA = dx.mdf +user.c: dx.mdf + _complex.o: _compparse.h HEADERS1 = \ diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.am --- dx-4.4.4/src/exec/libdx/Makefile.am.r 2006-03-27 20:56:53.000000000 +0200 +++ dx-4.4.4/src/exec/libdx/Makefile.am 2009-11-06 11:47:32.234939235 +0100 @@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@ #INCLUDES = -I../../../include -D@ARCH@ INCLUDES = -I${top_srcdir}/include -D@ARCH@ -dxlibdir = $(prefix)/dx/lib_@ARCH@ +dxlibdir = $(libdir) noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la #dxlib_LIBRARIES = libDXlite.a diff -up dx-4.4.4/src/exec/libdx/memory.c.r dx-4.4.4/src/exec/libdx/memory.c --- dx-4.4.4/src/exec/libdx/memory.c.r 2006-08-21 18:42:42.000000000 +0200 +++ dx-4.4.4/src/exec/libdx/memory.c 2009-11-06 11:47:32.235941444 +0100 @@ -66,7 +66,6 @@ #if linux #include <linux/kernel.h> -#include <linux/sys.h> #include <sys/sysinfo.h> #endif diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am --- dx-4.4.4/src/exec/Makefile.am.r 2003-09-17 00:40:40.000000000 +0200 +++ dx-4.4.4/src/exec/Makefile.am 2009-11-06 11:47:32.236940232 +0100 @@ -1,6 +1,6 @@ SUBDIRS = libdx dxmods hwrender dpexec dxexec -dxlibdir = $(prefix)/dx/lib_@ARCH@ +dxlibdir = $(libdir) MAJOR_VERSION=@MAJOR_VERSION@ MINOR_VERSION=@MINOR_VERSION@ diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am --- dx-4.4.4/src/misc/Makefile.am.r 2003-07-12 02:12:13.000000000 +0200 +++ dx-4.4.4/src/misc/Makefile.am 2009-11-06 11:47:32.236940232 +0100 @@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@AR dxbindir = $(prefix)/bin noinst_PROGRAMS = dxlocal -archmakdir = $(prefix)/dx/lib_$(ARCH) +archmakdir = $(libdir) archmak_DATA = arch.mak dxlocal_SOURCES = dx.c utils.c @@ -15,5 +15,5 @@ install-exec-local: if test ! -z "@INSTALL_BIN_PROGRAM@" ; then \ $(mkinstalldirs) $(prefix)/bin ; \ $(INSTALL) dxlocal@EXEEXT@ \ - $(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \ + $(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \ fi diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am --- dx-4.4.4/src/uipp/dxl/Makefile.am.r 2003-07-12 02:12:16.000000000 +0200 +++ dx-4.4.4/src/uipp/dxl/Makefile.am 2009-11-06 11:47:32.236940232 +0100 @@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@ INCLUDES = -I${top_srcdir}/include -D@ARCH@ -dxlibdir = $(prefix)/dx/lib_@ARCH@ +dxlibdir = $(libdir) noinst_HEADERS = \ dxlP.h \ diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am --- dx-4.4.4/src/uipp/dxui/Makefile.am.r 2003-07-12 02:12:17.000000000 +0200 +++ dx-4.4.4/src/uipp/dxui/Makefile.am 2009-11-06 11:47:32.237940486 +0100 @@ -2,7 +2,7 @@ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = dxui diff -up dx-4.4.4/src/uipp/java/Makefile.am.r dx-4.4.4/src/uipp/java/Makefile.am --- dx-4.4.4/src/uipp/java/Makefile.am.r 2006-03-27 20:06:09.000000000 +0200 +++ dx-4.4.4/src/uipp/java/Makefile.am 2009-11-06 11:47:32.238939763 +0100 @@ -27,12 +27,12 @@ ## libtool and the -shrext flag to make this much more ## portable. -javadxdir = $(prefix)/dx/java/htmlpages +javadxdir = $(libdir)/dx/java/htmlpages javadx_DATA = dx.jar -javasrvdir = $(prefix)/dx/java/server/class +javasrvdir = $(libdir)/dx/java/server/class javasrv_DATA = server.jar EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README -javalibdir = $(prefix)/dx/java/server/lib_@ARCH@ +javalibdir = $(libdir)/dx/java/server/lib_@ARCH@ javalib_DATA = @ANYDX@ SUBDIRS = server dx layout diff -up dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r dx-4.4.4/src/uipp/java/server/macros/Makefile.am --- dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r 1999-07-09 21:25:13.000000000 +0200 +++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am 2009-11-06 11:47:32.238939763 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -serverdatadir = $(prefix)/dx/java/server/dxmacros +serverdatadir = $(libdir)/dx/java/server/dxmacros serverdata_DATA = $(MACRO_FILES) diff -up dx-4.4.4/src/uipp/java/server/Makefile.am.r dx-4.4.4/src/uipp/java/server/Makefile.am --- dx-4.4.4/src/uipp/java/server/Makefile.am.r 2001-05-21 16:47:39.000000000 +0200 +++ dx-4.4.4/src/uipp/java/server/Makefile.am 2009-11-06 11:47:32.238939763 +0100 @@ -1,6 +1,6 @@ -srvbindir = $(prefix)/dx/java/server/bin -srvoutputdir = $(prefix)/dx/java/output -userhtmldir = $(prefix)/dx/java/user +srvbindir = $(libdir)/dx/java/server/bin +srvoutputdir = $(libdir)/dx/java/output +userhtmldir = $(libdir)/dx/java/user # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files srvrundir = $(srvbindir)/../class diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am --- dx-4.4.4/src/uipp/mb/Makefile.am.r 2003-08-20 16:21:33.000000000 +0200 +++ dx-4.4.4/src/uipp/mb/Makefile.am 2009-11-06 11:47:32.239939528 +0100 @@ -2,7 +2,7 @@ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = builder diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Makefile.am --- dx-4.4.4/src/uipp/prompter/Makefile.am.r 2003-11-04 05:20:14.000000000 +0100 +++ dx-4.4.4/src/uipp/prompter/Makefile.am 2009-11-06 11:47:32.239939528 +0100 @@ -2,7 +2,7 @@ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = prompter diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makefile.am --- dx-4.4.4/src/uipp/startup/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200 +++ dx-4.4.4/src/uipp/startup/Makefile.am 2009-11-06 11:47:32.240940272 +0100 @@ -2,7 +2,7 @@ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = startupui diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.am --- dx-4.4.4/src/uipp/tutor/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200 +++ dx-4.4.4/src/uipp/tutor/Makefile.am 2009-11-06 11:47:32.240940272 +0100 @@ -2,7 +2,7 @@ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = tutor diff -up dx-4.4.4/src/uipp/ui/Makefile.am.r dx-4.4.4/src/uipp/ui/Makefile.am --- dx-4.4.4/src/uipp/ui/Makefile.am.r 2001-04-12 16:29:02.000000000 +0200 +++ dx-4.4.4/src/uipp/ui/Makefile.am 2009-11-06 11:47:32.240940272 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -uidatadir = $(prefix)/dx/ui +uidatadir = $(datadir)/dx/ui DATA1 = \ icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \