--- xfm-1.4.3/Makefile.orig 2003-09-07 13:40:21.000000000 -0400 +++ xfm-1.4.3/Makefile 2003-09-07 13:41:16.000000000 -0400 @@ -918,7 +918,7 @@ # ---------------------------------------------------------------------- # start of Imakefile -XFMLIBDIR = $(LIBDIR)/xfm +XFMLIBDIR = $(DESTDIR)$(LIBDIR)/xfm XPMINCDIR = XPMLIBDIR = @@ -1082,15 +1082,15 @@ $(RM) xfm.install.script install:: xfm.install.script - @if [ -d $(DESTDIR)$(DESTDIR)$(BINDIR) ]; then \ + @if [ -d $(DESTDIR)$(BINDIR) ]; then \ set +x; \ else \ - if [ -h $(DESTDIR)$(DESTDIR)$(BINDIR) ]; then \ - (set -x; rm -f $(DESTDIR)$(DESTDIR)$(BINDIR)); \ + if [ -h $(DESTDIR)$(BINDIR) ]; then \ + (set -x; rm -f $(DESTDIR)$(BINDIR)); \ fi; \ - (set -x; $(MKDIRHIER) $(DESTDIR)$(DESTDIR)$(BINDIR)); \ + (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \ fi - $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) xfm.install.script $(DESTDIR)$(DESTDIR)$(BINDIR)/xfm.install + $(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) xfm.install.script $(DESTDIR)$(BINDIR)/xfm.install Xfm.ad:: lib/Xfm.cpp src/FmVersion.h $(RM) $@