$NetBSD: patch-aa,v 1.4 2010/01/29 19:43:37 joerg Exp $

--- Makefile.in.orig	2003-11-06 21:36:36.000000000 +0000
+++ Makefile.in
@@ -72,8 +72,8 @@ TEACHCE =	teach-ce
 BACKUP =	ce.bak
 
 LINTFLAGS=	-chx
-DESTDIR=	$(bindir)
-MANDIR=		$(man1dir)
+BINDIR=		${DESTDIR}$(bindir)
+MANDIR=		${DESTDIR}$(man1dir)
 
 #
 # Systems like the NeXT that cannot use a non-libc malloc should comment
@@ -81,7 +81,7 @@ MANDIR=		$(man1dir)
 #
 
 # DOCDIR must agree with the definition for LIBDIR in the source (see ce.h)
-DOCDIR=		$(libdir)/ce
+DOCDIR=		${DESTDIR}$(libdir)/ce
 
 CFILES=		basic.c bind.c buffer.c bug.c cinfo.c cmode.c \
 		complete.c dir.c display.c file.c fileio.c fio.c func.c \
@@ -233,29 +233,31 @@ backup:
 depend:
 	makedepend -- $(CCFLAGS) -- $(CFILES)
 
-installdirs:
-	@${SHELL} $(SUPPORT_SRC)/mkdirs $(DESTDIR)
-	@${SHELL} $(SUPPORT_SRC)/mkdirs $(MANDIR)
-	@${SHELL} $(SUPPORT_SRC)/mkdirs $(DOCDIR)   
-
-install:	${PROG} ${XPROG} installdirs
-	-$(MV) ${DESTDIR}/${PROG} ${DESTDIR}/${PROG}.${OLDEXT}
-	-$(MV) ${DESTDIR}/${XPROG} ${DESTDIR}/${XPROG}.${OLDEXT}
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)/${PROG}
-	$(INSTALL_PROGRAM) $(XPROG) $(DESTDIR)/${XPROG}
-	$(INSTALL_SCRIPT) $(TEACHCE) $(DESTDIR)/$(TEACHCE)
+install:	${PROG}
+	@${SHELL} $(SUPPORT_SRC)/mkdirs $(BINDIR)
+	$(INSTALL_PROGRAM) $(PROG) $(BINDIR)/${PROG}
+
+install-x11:	${XPROG}
+	@${SHELL} $(SUPPORT_SRC)/mkdirs $(BINDIR)
+	$(INSTALL_PROGRAM) $(XPROG) $(BINDIR)/${XPROG}
 
 install-strip:
 	$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
 		prefix=${prefix} exec_prefix=${exec_prefix} install
 
-doc-install:	man-install installdirs
+doc-install:
+	@${SHELL} $(SUPPORT_SRC)/mkdirs $(DOCDIR)   
 	${INSTALL_DATA} ${DOC_SRC}/TUTORIAL $(DOCDIR)/TUTORIAL
 	${INSTALL_DATA} ${DOC_SRC}/ce.help  $(DOCDIR)/ce.help
 	${INSTALL_DATA} ${DOC_SRC}/FUNCTIONS $(DOCDIR)/FUNCTIONS
+	$(INSTALL_SCRIPT) $(TEACHCE) $(BINDIR)/$(TEACHCE)
 
-man-install: installdirs
+man-install:
+	@${SHELL} $(SUPPORT_SRC)/mkdirs $(MANDIR)
 	${INSTALL_DATA} ${DOC_SRC}/ce.1 $(MANDIR)/ce.1
+
+man-install-x11:
+	@${SHELL} $(SUPPORT_SRC)/mkdirs $(MANDIR)
 	${INSTALL_DATA} ${DOC_SRC}/xce.1 $(MANDIR)/xce.1
 
 all-install:	install doc-install man-install