--- cw-1.0.14/Makefile.in.build	2005-09-26 04:27:57.000000000 +0200
+++ cw-1.0.14/Makefile.in	2006-11-04 03:22:49.000000000 +0100
@@ -31,16 +31,16 @@
 	@$(ECHO) "* Installing color wrapper locally..."
 	@$(MKDIR) -m 755 $(HOME)/.cw $(HOME)/.cw/bin $(HOME)/.cw/def\
         $(HOME)/.cw/def/etc
-	@for FILE in bin/*;do\
+	@for FILE in bin/*;do \
 	$(INSTALL) -m 755 $$FILE $(HOME)/.cw/bin/;\
 	done
 	@$(LN) -sf $(HOME)/.cw/bin/cw $(HOME)/.cw/bin/cwe
 	@$(ECHO) "* Installing color wrapper generic definition files..."
-	@for FILE in def/*;do\
+	@for FILE in def/*;do \
 	$(INSTALL) -m 755 $$FILE $(HOME)/.cw/def/;\
 	done
 	@$(ECHO) "* Installing color wrapper generic header/footer files..."
-	@for FILE in etc/*;do\
+	@for FILE in etc/*;do \
 	$(INSTALL) -m 644 $$FILE $(HOME)/.cw/def/etc/;\
 	done
 	@$(ECHO) "* Updating definition files..."
@@ -61,28 +61,29 @@
 	@$(ECHO) "* PLEASE view the ./README file for more information if"\
         "you haven't already."
 
-install: cleanpub cw cwu
+install: cw cwu
 	@$(ECHO) "* Installing color wrapper..."
-	@for FILE in bin/*;do\
-	$(INSTALL) -o 0 -g 0 -m 755 $$FILE $(BINDIR);\
+	$(MKDIR) -p -m 755 $(DESTDIR)$(BINDIR); $(MKDIR) -p -m 755 $(DESTDIR)$(MANDIR)/man1
+	@for FILE in bin/*;do \
+	$(INSTALL) -m 755 $$FILE $(DESTDIR)$(BINDIR);\
 	done
-	@$(LN) -sf $(BINDIR)/cw $(BINDIR)/cwe
+	@(cd $(DESTDIR)$(BINDIR) && $(LN) -sf cw cwe)
 	@$(ECHO) "* Installing color wrapper generic definition files..."
-	@$(MKDIR) -m 755 $(LIBDIR)/cw/
-	@for FILE in def/*;do\
-	$(INSTALL) -o 0 -g 0 -m 755 $$FILE $(LIBDIR)/cw/;\
+	@$(MKDIR) -p -m 755 $(DESTDIR)$(LIBDIR)/cw/
+	@for FILE in def/*;do \
+	$(INSTALL) -m 755 $$FILE $(DESTDIR)$(LIBDIR)/cw/;\
 	done
 	@$(ECHO) "* Installing color wrapper generic header/footer files..."
-	@$(MKDIR) -m 755 $(LIBDIR)/cw/etc
-	@for FILE in etc/*;do\
-	$(INSTALL) -o 0 -g 0 -m 644 $$FILE $(LIBDIR)/cw/etc;\
+	@$(MKDIR) -p -m 755 $(DESTDIR)$(LIBDIR)/cw/etc
+	@for FILE in etc/*;do \
+	$(INSTALL) -m 644 $$FILE $(DESTDIR)$(LIBDIR)/cw/etc;\
 	done
 	@$(ECHO) "* Installing manual pages..."
-	@for FILE in man/*;do\
-	$(INSTALL) -o 0 -g 0 -m 644 $$FILE $(MANDIR)/man1/;\
+	@for FILE in man/*;do \
+	$(INSTALL) -m 644 $$FILE $(DESTDIR)$(MANDIR)/man1/;\
 	done
 	@$(ECHO) "* Updating definition files..."
-	@$(BINDIR)/cwu $(LIBDIR)/cw $(BINDIR)/cw
+	@$(DESTDIR)$(BINDIR)/cwu $(DESTDIR)$(LIBDIR)/cw  $(DESTDIR)$(BINDIR)/cw
 	@$(ECHO) "-----------------------------------------------------------"
 	@$(ECHO) "* Complete, definitions are stored in: $(LIBDIR)/cw"
 	@$(ECHO) "* For bash: place 'export PATH=\"$(LIBDIR)/cw:\$$PATH\"'"\
@@ -95,7 +96,7 @@
         "\"color\" command, or the environmental variable NOCOLOR=1 to turn"\
         "color wrapping on and off."
 	@$(ECHO) ""
-	@$(ECHO) "* PLEASE view the ./README file for more information if"\
+	@$(ECHO) "* PLEASE view the README file for more information if"\
         "you haven't already."
 
 clean: