bin/Makefile.am | 2 +- bin/dx.in | 2 +- configure.ac | 29 ++++++++++++++--------------- doc/Makefile.am | 2 +- fonts/Makefile.am | 2 +- help/Makefile.am | 2 +- html/Makefile.am | 2 +- html/images/Makefile.am | 2 +- html/pages/Makefile.am | 2 +- include/Makefile.am | 2 +- include/dx/Makefile.am | 2 +- lib/Makefile.am | 2 +- man/manl/Makefile.am | 2 +- man/manl/dx.l | 2 +- src/exec/Makefile.am | 2 +- src/exec/dxexec/Makefile.am | 8 ++++---- src/exec/dxmods/Makefile.am | 2 +- src/exec/dxmods/_im_image.c | 27 ++++++++++++++------------- src/exec/hwrender/gl/hwLoad.c | 2 +- src/exec/hwrender/opengl/hwLoadOGL.c | 2 +- src/exec/hwrender/starbase/hwLoad.c | 2 +- src/exec/hwrender/xgl/hwLoad.c | 2 +- src/exec/libdx/Makefile.am | 2 +- src/exec/libdx/fileio.c | 2 +- src/exec/libdx/lbcolor.c | 2 +- src/exec/libdx/memory.c | 2 +- src/misc/Makefile.am | 4 ++-- src/uipp/dxl/Makefile.am | 3 ++- src/uipp/dxl/conn.c | 2 +- src/uipp/dxui/Makefile.am | 2 +- src/uipp/dxuilib/EditorWindow.C | 2 +- src/uipp/dxuilib/UndoDeletion.C | 4 ++-- src/uipp/dxuilib/UndoMove.C | 2 ++ src/uipp/mb/Makefile.am | 2 +- src/uipp/prompter/Makefile.am | 2 +- src/uipp/startup/Makefile.am | 2 +- src/uipp/tutor/Makefile.am | 2 +- src/uipp/ui/Makefile.am | 2 +- 38 files changed, 71 insertions(+), 68 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 2665806..246cb76 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -dxbindir = $(prefix)/dx/bin +dxbindir = $(libexecdir)/dx/bin bindir = $(prefix)/bin EXTRA_SCRIPTS = mdf2c dx diff --git a/bin/dx.in b/bin/dx.in index d3c69f7..f953b32 100644 --- a/bin/dx.in +++ b/bin/dx.in @@ -287,7 +287,7 @@ fi if [ -z "$DXROOT" ]; then prefix=@prefix@ - DXROOT=$prefix/dx + DXROOT=$prefix/lib/dx fi export DXROOT diff --git a/configure.ac b/configure.ac index 15ff3ff..6f95e85 100644 --- a/configure.ac +++ b/configure.ac @@ -27,6 +27,7 @@ AC_SUBST(MAJOR_VERSION)dnl AC_SUBST(MINOR_VERSION)dnl AC_SUBST(MICRO_VERSION)dnl +CPPFLAGS=${CXXFLAGS} SHELL=sh BUILDBASE="`pwd`" @@ -219,7 +220,7 @@ dnl End of command line options configuration dnl Start DX configuration AC_LANG([C++]) -AC_CHECK_HEADERS(stdlib.h) +dnl AC_CHECK_HEADERS(stdlib.h) AC_LANG([C]) # @@ -479,15 +480,13 @@ fi AC_CHECK_LIB(ICE, IceConnectionNumber) AC_CHECK_LIB(SM, SmcSetProperties) -AC_CHECK_LIB(xlibcon, printf) -AC_CHECK_LIB(xlib, XCreateWindow) -AC_CHECK_LIB(xt, XtVaGetValues) -AC_CHECK_LIB(xmstatxt, XtVaGetValues) -AC_CHECK_LIB(xmstatic, XmStringFree) -AC_CHECK_LIB(xm, XmStringFree) -AC_CHECK_LIB(hclglx, glXGetConfig) -AC_CHECK_LIB(hclglu, gluBuild2DMipmaps) -AC_CHECK_LIB(glwstati, glAccum) +AC_CHECK_LIB(c, printf) +AC_CHECK_LIB(X11, XCreateWindow) +AC_CHECK_LIB(Xt, XtVaGetValues) +AC_CHECK_LIB(Xm, XmStringFree) +AC_CHECK_LIB(GL, glXGetConfig) +AC_CHECK_LIB(GLU, gluBuild2DMipmaps) +AC_CHECK_LIB(GL, glAccum) AC_CHECK_LIB(X11, XCreateGC) AC_CHECK_LIB(Xt, XtMalloc) @@ -546,7 +545,7 @@ if test "$ARCH" = "solaris" ; then fi dnl A couple libs for cygwin -AC_CHECK_LIB(REXP, regcomp) +AC_CHECK_LIB(rx, regcomp) DX_CHECK_TGMATH dnl If buildlibdx off then pass this down to the Makefile @@ -686,9 +685,9 @@ else AC_MSG_RESULT(no -- some components failed test) have_hdf='no (failed tests)' else - LIB_HDF='-ldf' + LIB_HDF='-lhdf' LIBS="$LIB_HDF $LIBS" - FMT_LIBS="$FMT_LIBS libdf.a" + FMT_LIBS="$FMT_LIBS libhdf.so" AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries]) AC_MSG_RESULT(yes) have_hdf='yes' @@ -836,7 +835,7 @@ 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 ]) + 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 @@ -850,7 +849,7 @@ dnl CFLAGS="`Magick-config --cflags` $CFLAGS" LIB_MAGICK="$LIBS `Magick-config --ldflags` `Magick-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" + FMT_LIBS="$FMT_LIBS libMagickCore.so" AC_DEFINE(HAVE_LIBMAGICK, 1, [Define to 1 if you have the ImageMagick libraries]) AC_MSG_RESULT(yes) have_magick='yes' diff --git a/doc/Makefile.am b/doc/Makefile.am index 09838e8..ec6e60b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -docdir = $(prefix)/dx/doc +docdir = $(libexecdir)/dx/doc doc_DATA = \ README README_SMP README_alphax README_aviion README_hp700 \ diff --git a/fonts/Makefile.am b/fonts/Makefile.am index 9055aa4..8c4cfdd 100644 --- a/fonts/Makefile.am +++ b/fonts/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -fontdir = $(prefix)/dx/fonts +fontdir = $(libexecdir)/dx/fonts font_DATA = \ README area.dx cyril_d.dx \ diff --git a/help/Makefile.am b/help/Makefile.am index 7feff54..11b2211 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -helpdir = $(prefix)/dx/help +helpdir = $(libexecdir)/dx/help EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \ $(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \ diff --git a/html/Makefile.am b/html/Makefile.am index 7e9b3e8..35abe62 100644 --- a/html/Makefile.am +++ b/html/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -htmldir = $(prefix)/dx/html +htmldir = $(libexecdir)/dx/html SUBDIRS = pages images diff --git a/html/images/Makefile.am b/html/images/Makefile.am index c34245f..a935af6 100644 --- a/html/images/Makefile.am +++ b/html/images/Makefile.am @@ -1,5 +1,5 @@ -imagesdir = $(prefix)/dx/html/images +imagesdir = $(libexecdir)/dx/html/images images1 = \ 3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \ diff --git a/html/pages/Makefile.am b/html/pages/Makefile.am index 4487d39..3acad95 100644 --- a/html/pages/Makefile.am +++ b/html/pages/Makefile.am @@ -1,4 +1,4 @@ -pagesdir = $(prefix)/dx/html/pages +pagesdir = $(libexecdir)/dx/html/pages pages1 = \ insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \ diff --git a/include/Makefile.am b/include/Makefile.am index ec87339..04771c3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -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 --git a/include/dx/Makefile.am b/include/dx/Makefile.am index 45ebd6a..fc93323 100644 --- a/include/dx/Makefile.am +++ b/include/dx/Makefile.am @@ -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 --git a/lib/Makefile.am b/lib/Makefile.am index fba0cd7..a717e6c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -libsdir = $(prefix)/dx/lib +libsdir = $(libexecdir)/dx/lib libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \ dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c diff --git a/man/manl/Makefile.am b/man/manl/Makefile.am index b73bdb0..ae111e6 100644 --- a/man/manl/Makefile.am +++ b/man/manl/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -mandir = $(prefix)/dx/man +mandir = $(prefix)/share/man man_MANS = dx.l EXTRA_DIST = $(man_MANS) diff --git a/man/manl/dx.l b/man/manl/dx.l index 82465f9..f7ee99b 100644 --- a/man/manl/dx.l +++ b/man/manl/dx.l @@ -440,7 +440,7 @@ scientific notation is made. The default is 7. This contains the name of an alternate file that contains mappings of color names to red, green, blue triplets in a format like that of the default color file found in -/usr/lpp/dx/lib/colors.txt. +/usr/lib/dx/lib/colors.txt. .TP .SO DXDATA This contains a colon separated list diff --git a/src/exec/Makefile.am b/src/exec/Makefile.am index 26812d9..438a6fd 100644 --- a/src/exec/Makefile.am +++ b/src/exec/Makefile.am @@ -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 --git a/src/exec/dxexec/Makefile.am b/src/exec/dxexec/Makefile.am index 17b7c4b..6e48cf1 100644 --- a/src/exec/dxexec/Makefile.am +++ b/src/exec/dxexec/Makefile.am @@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la libDXEXEC_la_SOURCES = main.c libDXEXEC_la_CFLAGS = $(AM_CFLAGS) -bindir = $(prefix)/dx/bin_@ARCH@ +bindir = $(libexecdir)/dx/bin_@ARCH@ bin_PROGRAMS = dxexec dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \ @@ -22,9 +22,9 @@ EXTRA_DIST = tmain.cpp install-data-hook: if test "$(ARCH)" = "intelnt" ; then \ - $(INSTALL_DATA) dxexec.exp $(DESTDIR)$(prefix)/dx/lib_intelnt/dxexec.exp ; \ - $(INSTALL_DATA) dxexec.lib $(DESTDIR)$(prefix)/dx/lib_intelnt/dxexec.lib ; \ + $(INSTALL_DATA) dxexec.exp $(DESTDIR)$(libexecdir)/dx/lib_intelnt/dxexec.exp ; \ + $(INSTALL_DATA) dxexec.lib $(DESTDIR)$(libexecdir)/dx/lib_intelnt/dxexec.lib ; \ fi if test "$(ARCH)" = "cygwin" ; then \ - $(INSTALL_DATA) dxexec.a $(DESTDIR)$(prefix)/dx/lib_cygwin/dxexec.a; \ + $(INSTALL_DATA) dxexec.a $(DESTDIR)$(libexecdir)/dx/lib_cygwin/dxexec.a; \ fi diff --git a/src/exec/dxmods/Makefile.am b/src/exec/dxmods/Makefile.am index bafde53..924fca3 100644 --- a/src/exec/dxmods/Makefile.am +++ b/src/exec/dxmods/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D@ARCH@ -dxmdfdir = $(prefix)/dx/lib +dxmdfdir = $(libexecdir)/dx/lib noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la SUFFIXES = .c .y .c .s .h .o diff --git a/src/exec/dxmods/_im_image.c b/src/exec/dxmods/_im_image.c index b7ca6df..e569ba5 100644 --- a/src/exec/dxmods/_im_image.c +++ b/src/exec/dxmods/_im_image.c @@ -328,9 +328,9 @@ static Error write_im(RWImageArgs *iargs) { DestroyImage(image); DestroyImageInfo(new_frame_info); DestroyImageInfo(image_info); -#if MagickLibVersion > 0x0537 - DestroyConstitute(); -#endif +//if MagickLibVersion > 0x0537 +// DestroyConstitute(); +//endif DXSetError(ERROR_INTERNAL, "reason = %s, description = %s", image->exception.reason, image->exception.description); @@ -345,9 +345,9 @@ static Error write_im(RWImageArgs *iargs) { DestroyImage(image); DestroyImageInfo(new_frame_info); DestroyImageInfo(image_info); -#if MagickLibVersion > 0x0537 - DestroyConstitute(); -#endif +//if MagickLibVersion > 0x0537 +// DestroyConstitute(); +//endif DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c"); } @@ -374,9 +374,9 @@ static Error write_im(RWImageArgs *iargs) { DestroyImage(image); DestroyImageInfo(image_info); DestroyImageInfo(new_frame_info); -#if MagickLibVersion > 0x0537 - DestroyConstitute(); -#endif +//if MagickLibVersion > 0x0537 +// DestroyConstitute(); +//endif DEBUGMESSAGE("back from DestroyImage"); @@ -490,9 +490,9 @@ static Error write_im(RWImageArgs *iargs) { DXFree(copycolors); DestroyImage(image); DestroyImageInfo(image_info); -#if MagickLibVersion > 0x0537 - DestroyConstitute(); -#endif +//if MagickLibVersion > 0x0537 +// DestroyConstitute(); +//endif } return (OK); #else /* ndef HAVE_LIBMAGICK */ @@ -997,9 +997,10 @@ Field _dxf_InputIM( int width, int height, char *name, int relframe, *(pptr++) = *(indexes++); /* Opacities in colormap is wrong; use direct color map */ + int idx2 = atoi((const char *)indexes2); if ( image->matte ) for ( x = 0; x < width; x++ ) - omap[*(indexes2++)] = ( 1.0 - + omap[idx2++] = ( 1.0 - ((float) (pixies++)->opacity) / MaxRGB ); } } else diff --git a/src/exec/hwrender/gl/hwLoad.c b/src/exec/hwrender/gl/hwLoad.c index e2797ce..bfa70d9 100644 --- a/src/exec/hwrender/gl/hwLoad.c +++ b/src/exec/hwrender/gl/hwLoad.c @@ -122,7 +122,7 @@ _dxfHWload(tdmPortHandleP (**initPP)(Display*, char*), Display *dsp) } else { - strcpy(HWpath,"/usr/lpp/dx/bin_ibm6000"); + strcpy(HWpath,"/usr/lib/dx/bin_ibm6000"); } diff --git a/src/exec/hwrender/opengl/hwLoadOGL.c b/src/exec/hwrender/opengl/hwLoadOGL.c index 14f860d..6e1ca41 100644 --- a/src/exec/hwrender/opengl/hwLoadOGL.c +++ b/src/exec/hwrender/opengl/hwLoadOGL.c @@ -299,7 +299,7 @@ int _dxfHWload(tdmPortHandleP (**initPP)(Display*, char*), Display *dpy) } else { - strcpy(HWpath,"/usr/lpp/dx/bin_"); + strcpy(HWpath,"/usr/lib/dx/bin_"); strcat(HWpath,DXD_ARCHNAME); } diff --git a/src/exec/hwrender/starbase/hwLoad.c b/src/exec/hwrender/starbase/hwLoad.c index 2a8b040..22b2fa5 100644 --- a/src/exec/hwrender/starbase/hwLoad.c +++ b/src/exec/hwrender/starbase/hwLoad.c @@ -76,7 +76,7 @@ _dxfHWload(tdmPortHandleP (**initPP)(Display*, char*), Display *dsp) goto loadlib; } - strcpy(HWpath,"/usr/lpp/dx/bin_hp700/"); + strcpy(HWpath,"/usr/lib/dx/bin_hp700/"); strcat(HWpath,HWname); if (!stat(HWpath,&statbuf)) diff --git a/src/exec/hwrender/xgl/hwLoad.c b/src/exec/hwrender/xgl/hwLoad.c index c4a2fea..fc1e161 100644 --- a/src/exec/hwrender/xgl/hwLoad.c +++ b/src/exec/hwrender/xgl/hwLoad.c @@ -112,7 +112,7 @@ _dxfHWload(tdmPortHandleP (**initPP)(Display*, char* ), Display *dsp) goto loadlib; } - strcpy(HWpath,"/usr/lpp/dx/bin_"); + strcpy(HWpath,"/usr/lib/dx/bin_"); strcat(HWpath,DXD_ARCHNAME); strcat(HWpath,"/"); strcat(HWpath,HWname); diff --git a/src/exec/libdx/Makefile.am b/src/exec/libdx/Makefile.am index 354fb78..c38551d 100644 --- a/src/exec/libdx/Makefile.am +++ b/src/exec/libdx/Makefile.am @@ -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 --git a/src/exec/libdx/fileio.c b/src/exec/libdx/fileio.c index 36a4560..2335ca8 100644 --- a/src/exec/libdx/fileio.c +++ b/src/exec/libdx/fileio.c @@ -263,7 +263,7 @@ Error _dxffile_open(char *name, int rw) case 2:/* read/write */ fd = open(name, O_RDWR); if (fd < 0) { - fd = open(name, O_WRONLY | O_CREAT); + fd = open(name, O_WRONLY | O_CREAT, 0644); if (fd < 0) { DXSetError(ERROR_DATA_INVALID, "can't open/create file '%s'", name); diff --git a/src/exec/libdx/lbcolor.c b/src/exec/libdx/lbcolor.c index 87eb28e..82067ca 100644 --- a/src/exec/libdx/lbcolor.c +++ b/src/exec/libdx/lbcolor.c @@ -166,7 +166,7 @@ Error DXColorNameToRGB(char *colorstr, RGBColor *colorvec) if (in) goto got_colorfile; } /* if we still haven't succeeded, try the system version */ - in = fopen("/usr/local/dx/lib/colors.txt","r"); + in = fopen("/usr/lib/dx/lib/colors.txt","r"); if (in) goto got_colorfile; /* all has failed; use our old table */ diff --git a/src/exec/libdx/memory.c b/src/exec/libdx/memory.c index caa3281..50c8056 100644 --- a/src/exec/libdx/memory.c +++ b/src/exec/libdx/memory.c @@ -66,7 +66,7 @@ #if linux #include -#include +//include #include #endif diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am index 5955165..26412e9 100644 --- a/src/misc/Makefile.am +++ b/src/misc/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@ARCH@ 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@ ; \ + $(libexecdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \ fi diff --git a/src/uipp/dxl/Makefile.am b/src/uipp/dxl/Makefile.am index a8cf233..5d46085 100644 --- a/src/uipp/dxl/Makefile.am +++ b/src/uipp/dxl/Makefile.am @@ -4,10 +4,11 @@ MAJOR_VERSION=@MAJOR_VERSION@ MINOR_VERSION=@MINOR_VERSION@ MICRO_VERSION=@MICRO_VERSION@ +LIBS += -L${top_srcdir}/src/exec/.libs -lDX INCLUDES = -I${top_srcdir}/include -D@ARCH@ -dxlibdir = $(prefix)/dx/lib_@ARCH@ +dxlibdir = $(libdir) noinst_HEADERS = \ dxlP.h \ diff --git a/src/uipp/dxl/conn.c b/src/uipp/dxl/conn.c index e885c6a..a52729a 100644 --- a/src/uipp/dxl/conn.c +++ b/src/uipp/dxl/conn.c @@ -623,7 +623,7 @@ ConnectTo(const char *host, struct hostent *he; int findx; char *pathEnv; - char *defaultPath = "PATH=/usr/bin:/usr/local/dx/bin"; + char *defaultPath = "PATH=/usr/bin:/usr/lib/dx/bin"; int j; #ifdef hp700 int width = MAXFUPLIM; diff --git a/src/uipp/dxui/Makefile.am b/src/uipp/dxui/Makefile.am index 5247cb0..e6e8969 100644 --- a/src/uipp/dxui/Makefile.am +++ b/src/uipp/dxui/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libexecdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = dxui diff --git a/src/uipp/dxuilib/EditorWindow.C b/src/uipp/dxuilib/EditorWindow.C index c406cc1..c8d0d98 100644 --- a/src/uipp/dxuilib/EditorWindow.C +++ b/src/uipp/dxuilib/EditorWindow.C @@ -5997,7 +5997,7 @@ char msg[128]; // const char *tmpdir = theDXApplication->getTmpDirectory(); int tmpdirlen = STRLEN(tmpdir); - if (!tmpdirlen) return FALSE; + if (!tmpdirlen) return nullptr; if (tmpdir[tmpdirlen-1] == '/') { sprintf(netfilename, "%sdx%d.net", tmpdir, getpid()); sprintf(cfgfilename, "%sdx%d.cfg", tmpdir, getpid()); diff --git a/src/uipp/dxuilib/UndoDeletion.C b/src/uipp/dxuilib/UndoDeletion.C index 9d997bc..ae6f102 100644 --- a/src/uipp/dxuilib/UndoDeletion.C +++ b/src/uipp/dxuilib/UndoDeletion.C @@ -150,8 +150,8 @@ void UndoDeletion::undo(boolean first_in_list) } char* tmpFile = UniqueFilename(directory); tmplen = STRLEN(tmpFile); - sprintf(net_file_name, "%s.net", tmpFile, getpid()); - sprintf(cfg_file_name, "%s.cfg", tmpFile, getpid()); + sprintf(net_file_name, "%s.%d.net", tmpFile, getpid()); + sprintf(cfg_file_name, "%s.%d.cfg", tmpFile, getpid()); delete tmpFile; unlink (net_file_name); unlink (cfg_file_name); diff --git a/src/uipp/dxuilib/UndoMove.C b/src/uipp/dxuilib/UndoMove.C index 04b326d..d733d98 100644 --- a/src/uipp/dxuilib/UndoMove.C +++ b/src/uipp/dxuilib/UndoMove.C @@ -154,6 +154,8 @@ VPEAnnotator* UndoDecoratorMove::lookupDecorator() return dec; } } + + return nullptr; } boolean UndoDecoratorMove::canUndo() diff --git a/src/uipp/mb/Makefile.am b/src/uipp/mb/Makefile.am index d15de19..c0c2bda 100644 --- a/src/uipp/mb/Makefile.am +++ b/src/uipp/mb/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libexecdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = builder diff --git a/src/uipp/prompter/Makefile.am b/src/uipp/prompter/Makefile.am index aabbd69..961ee60 100644 --- a/src/uipp/prompter/Makefile.am +++ b/src/uipp/prompter/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libexecdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = prompter diff --git a/src/uipp/startup/Makefile.am b/src/uipp/startup/Makefile.am index b7c3a6a..bec6c2f 100644 --- a/src/uipp/startup/Makefile.am +++ b/src/uipp/startup/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libexecdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = startupui diff --git a/src/uipp/tutor/Makefile.am b/src/uipp/tutor/Makefile.am index 814de81..6bd1cd3 100644 --- a/src/uipp/tutor/Makefile.am +++ b/src/uipp/tutor/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@ -dxbindir = $(prefix)/dx/bin_@ARCH@ +dxbindir = $(libexecdir)/dx/bin_@ARCH@ dxbin_PROGRAMS = tutor diff --git a/src/uipp/ui/Makefile.am b/src/uipp/ui/Makefile.am index 7a8c0c1..910c3df 100644 --- a/src/uipp/ui/Makefile.am +++ b/src/uipp/ui/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -uidatadir = $(prefix)/dx/ui +uidatadir = $(libexecdir)/dx/ui DATA1 = \ icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \