Index: designer/Makefile
===================================================================
--- designer/Makefile	(revision 731355)
+++ designer/Makefile	(working copy)
@@ -27,25 +27,24 @@ i18ncheckarg \
 spelling \
 
 #default installation location
-PREFIX=/usr/local
-DESTDIR=$(PREFIX)/libexec/krazy-plugins/designer
+PREFIX=/usr/local/libexec/krazy-plugins/designer
 
 all:
 
 install::
-	@if test ! -d $(DESTDIR); then \
-		mkdir -p $(DESTDIR) || exit 1; \
+	@if test ! -d $(DESTDIR)$(PREFIX); then \
+		mkdir -p $(DESTDIR)$(PREFIX) || exit 1; \
 	fi
 
-	cp -f description.txt $(DESTDIR)
+	cp -f description.txt $(DESTDIR)$(PREFIX)
 
 	list="$(PLUGINS)"; for plugin in $$list; do \
 		echo "Installing plugin $$plugin"; \
-		cp -f $$plugin $(DESTDIR)/$$plugin; \
+		cp -f $$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 	list="$(PLUGINLNS)"; for plugin in $$list; do \
 		echo "Installing plugin link $$plugin"; \
-		( cd $(DESTDIR) && rm -f $$plugin && ln -s ../general/$$plugin $$plugin ); \
+		ln -sf ../general/$$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 
 clean:
Index: c++/Makefile
===================================================================
--- c++/Makefile	(revision 731355)
+++ c++/Makefile	(working copy)
@@ -47,25 +47,24 @@ spelling \
 
 
 #default installation location
-PREFIX=/usr/local
-DESTDIR=$(PREFIX)/libexec/krazy-plugins/c++
+PREFIX=/usr/local/libexec/krazy-plugins/c++
 
 all:
 
 install::
-	@if test ! -d $(DESTDIR); then \
-		mkdir -p $(DESTDIR) || exit 1; \
+	@if test ! -d $(DESTDIR)$(PREFIX); then \
+		mkdir -p $(DESTDIR)$(PREFIX) || exit 1; \
 	fi
 
-	cp -f description.txt $(DESTDIR)
+	cp -f description.txt $(DESTDIR)$(PREFIX)
 
 	list="$(PLUGINS)"; for plugin in $$list; do \
 		echo "Installing plugin $$plugin"; \
-		cp -f $$plugin $(DESTDIR)/$$plugin; \
+		cp -f $$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 	list="$(PLUGINLNS)"; for plugin in $$list; do \
 		echo "Installing plugin link $$plugin"; \
-		( cd $(DESTDIR) && rm -f $$plugin && ln -s ../general/$$plugin $$plugin ); \
+		ln -sf ../general/$$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 
 clean:
Index: desktop/Makefile
===================================================================
--- desktop/Makefile	(revision 731355)
+++ desktop/Makefile	(working copy)
@@ -26,25 +26,24 @@ endswithnewline \
 spelling \
 
 #default installation location
-PREFIX=/usr/local
-DESTDIR=$(PREFIX)/libexec/krazy-plugins/desktop
+PREFIX=/usr/local/libexec/krazy-plugins/desktop
 
 all:
 
 install::
-	@if test ! -d $(DESTDIR); then \
-		mkdir -p $(DESTDIR) || exit 1; \
+	@if test ! -d $(DESTDIR)$(PREFIX); then \
+		mkdir -p $(DESTDIR)$(PREFIX) || exit 1; \
 	fi
 
-	cp -f description.txt $(DESTDIR)
+	cp -f description.txt $(DESTDIR)$(PREFIX)
 
 	list="$(PLUGINS)"; for plugin in $$list; do \
 		echo "Installing plugin $$plugin"; \
-		cp -f $$plugin $(DESTDIR)/$$plugin; \
+		cp -f $$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 	list="$(PLUGINLNS)"; for plugin in $$list; do \
 		echo "Installing plugin link $$plugin"; \
-		( cd $(DESTDIR) && rm -f $$plugin && ln -s ../general/$$plugin $$plugin ); \
+		ln -sf ../general/$$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 
 clean:
Index: kconfigxt/Makefile
===================================================================
--- kconfigxt/Makefile	(revision 731355)
+++ kconfigxt/Makefile	(working copy)
@@ -27,25 +27,24 @@ i18ncheckarg \
 spelling
 
 #default installation location
-PREFIX=/usr/local
-DESTDIR=$(PREFIX)/libexec/krazy-plugins/kconfigxt
+PREFIX=/usr/local/libexec/krazy-plugins/kconfigxt
 
 all:
 
 install::
-	@if test ! -d $(DESTDIR); then \
-		mkdir -p $(DESTDIR) || exit 1; \
+	@if test ! -d $(DESTDIR)$(PREFIX); then \
+		mkdir -p $(DESTDIR)$(PREFIX) || exit 1; \
 	fi
 
-	cp -f description.txt $(DESTDIR)
+	cp -f description.txt $(DESTDIR)$(PREFIX)
 
 	list="$(PLUGINS)"; for plugin in $$list; do \
 		echo "Installing plugin $$plugin"; \
-		cp -f $$plugin $(DESTDIR)/$$plugin; \
+		cp -f $$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 	list="$(PLUGINLNS)"; for plugin in $$list; do \
 		echo "Installing plugin link $$plugin"; \
-		( cd $(DESTDIR) && rm -f $$plugin && ln -s ../general/$$plugin $$plugin ); \
+		ln -sf ../general/$$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 
 clean:
Index: general/Makefile
===================================================================
--- general/Makefile	(revision 731355)
+++ general/Makefile	(working copy)
@@ -24,21 +24,20 @@ i18ncheckarg \
 spelling \
 
 #default installation location
-PREFIX=/usr/local
-DESTDIR=$(PREFIX)/libexec/krazy-plugins/general
+PREFIX=/usr/local/libexec/krazy-plugins/general
 
 all:
 
 install::
-	@if test ! -d $(DESTDIR); then \
-		mkdir -p $(DESTDIR) || exit 1; \
+	@if test ! -d $(DESTDIR)$(PREFIX); then \
+		mkdir -p $(DESTDIR)$(PREFIX) || exit 1; \
 	fi
 
-	cp -f description.txt $(DESTDIR)
+	cp -f description.txt $(DESTDIR)$(PREFIX)
 
 	list="$(PLUGINS)"; for plugin in $$list; do \
 		echo "Installing plugin $$plugin"; \
-		cp -f $$plugin $(DESTDIR)/$$plugin; \
+		cp -f $$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 
 clean:
Index: Makefile
===================================================================
--- Makefile	(revision 731355)
+++ Makefile	(working copy)
@@ -25,16 +25,11 @@ desktop \
 kconfigxt
 
 #default installation location
-PREFIX=/usr/local
-DESTDIR=$(PREFIX)/libexec/krazy-plugins
+PREFIX=/usr/local/libexec/krazy-plugins
 
 all:
 
 install::
-	@if test ! -d $(DESTDIR); then \
-		mkdir -p $(DESTDIR) || exit 1; \
-	fi
-
 	list="$(SUBDIRS)"; for dir in $$list; do \
 		echo "Installing plugin subdir $$dir"; \
 		( cd $$dir && make install ); \
Index: po/Makefile
===================================================================
--- po/Makefile	(revision 731355)
+++ po/Makefile	(working copy)
@@ -25,25 +25,24 @@ endswithnewline \
 i18ncheckarg \
 
 #default installation location
-PREFIX=/usr/local
-DESTDIR=$(PREFIX)/libexec/krazy-plugins/po
+PREFIX=/usr/local/libexec/krazy-plugins/po
 
 all:
 
 install::
-	@if test ! -d $(DESTDIR); then \
-		mkdir -p $(DESTDIR) || exit 1; \
+	@if test ! -d $(DESTDIR)$(PREFIX); then \
+		mkdir -p $(DESTDIR)$(PREFIX) || exit 1; \
 	fi
 
-	cp -f description.txt $(DESTDIR)
+	cp -f description.txt $(DESTDIR)$(PREFIX)
 
 	list="$(PLUGINS)"; for plugin in $$list; do \
 		echo "Installing plugin $$plugin"; \
-		cp -f $$plugin $(DESTDIR)/$$plugin; \
+		cp -f $$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 	list="$(PLUGINLNS)"; for plugin in $$list; do \
 		echo "Installing plugin link $$plugin"; \
-		( cd $(DESTDIR) && rm -f $$plugin && ln -s ../general/$$plugin $$plugin ); \
+		ln -sf ../general/$$plugin $(DESTDIR)$(PREFIX)/$$plugin; \
 	done
 
 clean: