Index: trunk/src_plugins/autoplace/Makefile.mod
===================================================================
--- trunk/src_plugins/autoplace/Makefile.mod	(revision 1070)
+++ trunk/src_plugins/autoplace/Makefile.mod	(revision 1071)
@@ -1,7 +1,7 @@
 append /local/pcb/autoplace/enable {}
 append /local/pcb/autoplace/buildin {}
 
-append /local/pcb/autoplace/OBJS [@ ${PLUGDIR}/autoplace/autoplace.o ${PLUGDIR}/autoplace/action.o @]
+append /local/pcb/autoplace/OBJS [@ $(PLUGDIR)/autoplace/autoplace.o $(PLUGDIR)/autoplace/action.o @]
 
 if /local/pcb/autoplace/enable then
 	if /local/pcb/autoplace/buildin then
@@ -14,13 +14,13 @@
 @]
 
 	else
-		append /local/pcb/all   [@ ${PLUGDIR}/autoplace/autoplace.so @]
+		append /local/pcb/all   [@ $(PLUGDIR)/autoplace/autoplace.so @]
 		append /local/pcb/RULES [@
 
-${PLUGDIR}/autoplace/autoplace.so: @/local/pcb/autoplace/OBJS@
-	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o ${PLUGDIR}/autoplace/autoplace.so @/local/pcb/autoplace/OBJS@
+$(PLUGDIR)/autoplace/autoplace.so: @/local/pcb/autoplace/OBJS@
+	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o $(PLUGDIR)/autoplace/autoplace.so @/local/pcb/autoplace/OBJS@
 
-mod_autoplace: ${PLUGDIR}/autoplace/autoplace.so
+mod_autoplace: $(PLUGDIR)/autoplace/autoplace.so
 
 @]
 	end
Index: trunk/src_plugins/autoroute/Makefile.mod
===================================================================
--- trunk/src_plugins/autoroute/Makefile.mod	(revision 1070)
+++ trunk/src_plugins/autoroute/Makefile.mod	(revision 1071)
@@ -1,7 +1,7 @@
 append /local/pcb/autorouter/enable {}
 append /local/pcb/autorouter/buildin {}
 
-append /local/pcb/autorouter/OBJS [@ ${PLUGDIR}/autoroute/autoroute.o ${PLUGDIR}/autoroute/mtspace.o ${PLUGDIR}/autoroute/action.o @]
+append /local/pcb/autorouter/OBJS [@ $(PLUGDIR)/autoroute/autoroute.o $(PLUGDIR)/autoroute/mtspace.o $(PLUGDIR)/autoroute/action.o @]
 
 if /local/pcb/autorouter/enable then
 	if /local/pcb/autorouter/buildin then
@@ -14,13 +14,13 @@
 @]
 
 	else
-		append /local/pcb/all   [@ ${PLUGDIR}/autoroute/autoroute.so @]
+		append /local/pcb/all   [@ $(PLUGDIR)/autoroute/autoroute.so @]
 		append /local/pcb/RULES [@
 
-${PLUGDIR}/autoroute/autoroute.so: @/local/pcb/autorouter/OBJS@
-	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o ${PLUGDIR}/autoroute/autoroute.so @/local/pcb/autorouter/OBJS@
+$(PLUGDIR)/autoroute/autoroute.so: @/local/pcb/autorouter/OBJS@
+	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o $(PLUGDIR)/autoroute/autoroute.so @/local/pcb/autorouter/OBJS@
 
-mod_autoroute: ${PLUGDIR}/autoroute/autoroute.so
+mod_autoroute: $(PLUGDIR)/autoroute/autoroute.so
 
 @]
 	end
Index: trunk/src_plugins/djopt/Makefile.mod
===================================================================
--- trunk/src_plugins/djopt/Makefile.mod	(revision 1070)
+++ trunk/src_plugins/djopt/Makefile.mod	(revision 1071)
@@ -1,7 +1,7 @@
 append /local/pcb/djopt/enable {}
 append /local/pcb/djopt/buildin {}
 
-append /local/pcb/djopt/OBJS [@ ${PLUGDIR}/djopt/djopt.o @]
+append /local/pcb/djopt/OBJS [@ $(PLUGDIR)/djopt/djopt.o @]
 
 if /local/pcb/djopt/enable then
 	if /local/pcb/djopt/buildin then
@@ -14,13 +14,13 @@
 @]
 
 	else
-		append /local/pcb/all   [@ ${PLUGDIR}/djopt/djopt.so @]
+		append /local/pcb/all   [@ $(PLUGDIR)/djopt/djopt.so @]
 		append /local/pcb/RULES [@
 
-${PLUGDIR}/djopt/djopt.so: @/local/pcb/djopt/OBJS@
-	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o ${PLUGDIR}/djopt/djopt.so @/local/pcb/djopt/OBJS@
+$(PLUGDIR)/djopt/djopt.so: @/local/pcb/djopt/OBJS@
+	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o $(PLUGDIR)/djopt/djopt.so @/local/pcb/djopt/OBJS@
 
-mod_djopt: ${PLUGDIR}/djopt/djopt.so
+mod_djopt: $(PLUGDIR)/djopt/djopt.so
 
 @]
 	end
Index: trunk/src_plugins/edif/Makefile.mod
===================================================================
--- trunk/src_plugins/edif/Makefile.mod	(revision 1070)
+++ trunk/src_plugins/edif/Makefile.mod	(revision 1071)
@@ -1,7 +1,7 @@
 append /local/pcb/edif/enable {}
 append /local/pcb/edif/buildin {}
 
-append /local/pcb/edif/OBJS [@ ${PLUGDIR}/edif/edif.o @]
+append /local/pcb/edif/OBJS [@ $(PLUGDIR)/edif/edif.o @]
 append /local/pcb/YACC {edif}
 
 if /local/pcb/edif/enable then
@@ -15,13 +15,13 @@
 @]
 
 	else
-		append /local/pcb/all   [@ ${PLUGDIR}/edif/edif.so @]
+		append /local/pcb/all   [@ $(PLUGDIR)/edif/edif.so @]
 		append /local/pcb/RULES [@
 
-${PLUGDIR}/edif/edif.so: @/local/pcb/edif/OBJS@
-	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o ${PLUGDIR}/edif/edif.so @/local/pcb/edif/OBJS@
+$(PLUGDIR)/edif/edif.so: @/local/pcb/edif/OBJS@
+	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o $(PLUGDIR)/edif/edif.so @/local/pcb/edif/OBJS@
 
-mod_edif: ${PLUGDIR}/edif/edif.so
+mod_edif: $(PLUGDIR)/edif/edif.so
 
 @]
 	end
Index: trunk/src_plugins/gpmi/Makefile.mod
===================================================================
--- trunk/src_plugins/gpmi/Makefile.mod	(revision 1070)
+++ trunk/src_plugins/gpmi/Makefile.mod	(revision 1071)
@@ -4,7 +4,7 @@
 append /local/pcb/CLEANRULES  {clean_gpmi}
 
 append /local/pcb/TOPVARS [@
-PCB_GPMI=${PLUGDIR}/gpmi/pcb-gpmi
+PCB_GPMI=$(PLUGDIR)/gpmi/pcb-gpmi
 @]
 
 append /local/pcb/RULES [@
Index: trunk/src_plugins/mincut/Makefile.mod
===================================================================
--- trunk/src_plugins/mincut/Makefile.mod	(revision 1070)
+++ trunk/src_plugins/mincut/Makefile.mod	(revision 1071)
@@ -1,7 +1,7 @@
 append /local/pcb/mincut/enable {}
 append /local/pcb/mincut/buildin {}
 
-append /local/pcb/mincut/OBJS [@ ${PLUGDIR}/mincut/rats_mincut.o ${PLUGDIR}/mincut/pcb-mincut/graph.o ${PLUGDIR}/mincut/pcb-mincut/solve.o @]
+append /local/pcb/mincut/OBJS [@ $(PLUGDIR)/mincut/rats_mincut.o $(PLUGDIR)/mincut/pcb-mincut/graph.o $(PLUGDIR)/mincut/pcb-mincut/solve.o @]
 
 if /local/pcb/mincut/enable then
 	if /local/pcb/mincut/buildin then
@@ -14,13 +14,13 @@
 @]
 
 	else
-		append /local/pcb/all   [@ ${PLUGDIR}/mincut/mincut.so @]
+		append /local/pcb/all   [@ $(PLUGDIR)/mincut/mincut.so @]
 		append /local/pcb/RULES [@
 
-${PLUGDIR}/mincut/mincut.so: @/local/pcb/mincut/OBJS@
-	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o ${PLUGDIR}/mincut/mincut.so @/local/pcb/mincut/OBJS@
+$(PLUGDIR)/mincut/mincut.so: @/local/pcb/mincut/OBJS@
+	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o $(PLUGDIR)/mincut/mincut.so @/local/pcb/mincut/OBJS@
 
-mod_mincut: ${PLUGDIR}/mincut/mincut.so
+mod_mincut: $(PLUGDIR)/mincut/mincut.so
 
 @]
 	end
Index: trunk/src_plugins/puller/Makefile.mod
===================================================================
--- trunk/src_plugins/puller/Makefile.mod	(revision 1070)
+++ trunk/src_plugins/puller/Makefile.mod	(revision 1071)
@@ -1,7 +1,7 @@
 append /local/pcb/puller/enable {}
 append /local/pcb/puller/buildin {}
 
-append /local/pcb/puller/OBJS [@ ${PLUGDIR}/puller/puller.o @]
+append /local/pcb/puller/OBJS [@ $(PLUGDIR)/puller/puller.o @]
 
 if /local/pcb/puller/enable then
 	if /local/pcb/puller/buildin then
@@ -14,13 +14,13 @@
 @]
 
 	else
-		append /local/pcb/all   [@ ${PLUGDIR}/puller/puller.so @]
+		append /local/pcb/all   [@ $(PLUGDIR)/puller/puller.so @]
 		append /local/pcb/RULES [@
 
-${PLUGDIR}/puller/puller.so: @/local/pcb/puller/OBJS@
-	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o ${PLUGDIR}/puller/puller.so @/local/pcb/puller/OBJS@
+$(PLUGDIR)/puller/puller.so: @/local/pcb/puller/OBJS@
+	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o $(PLUGDIR)/puller/puller.so @/local/pcb/puller/OBJS@
 
-mod_puller: ${PLUGDIR}/puller/puller.so
+mod_puller: $(PLUGDIR)/puller/puller.so
 
 @]
 	end
Index: trunk/src_plugins/vendordrill/Makefile.mod
===================================================================
--- trunk/src_plugins/vendordrill/Makefile.mod	(revision 1070)
+++ trunk/src_plugins/vendordrill/Makefile.mod	(revision 1071)
@@ -1,7 +1,7 @@
 append /local/pcb/vendordrill/enable {}
 append /local/pcb/vendordrill/buildin {}
 
-append /local/pcb/vendordrill/OBJS [@ ${PLUGDIR}/vendordrill/vendor.o @]
+append /local/pcb/vendordrill/OBJS [@ $(PLUGDIR)/vendordrill/vendor.o @]
 
 if /local/pcb/vendordrill/enable then
 	if /local/pcb/vendordrill/buildin then
@@ -14,13 +14,13 @@
 @]
 
 	else
-		append /local/pcb/all   [@ ${PLUGDIR}/vendordrill/vendordrill.so @]
+		append /local/pcb/all   [@ $(PLUGDIR)/vendordrill/vendordrill.so @]
 		append /local/pcb/RULES [@
 
-${PLUGDIR}/vendordrill/vendordrill.so: @/local/pcb/vendordrill/OBJS@
-	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o ${PLUGDIR}/vendordrill/vendordrill.so @/local/pcb/vendordrill/OBJS@
+$(PLUGDIR)/vendordrill/vendordrill.so: @/local/pcb/vendordrill/OBJS@
+	$(CC) $(LDFLAGS) -shared @cc/rdynamic@ -o $(PLUGDIR)/vendordrill/vendordrill.so @/local/pcb/vendordrill/OBJS@
 
-mod_vendordrill: ${PLUGDIR}/vendordrill/vendordrill.so
+mod_vendordrill: $(PLUGDIR)/vendordrill/vendordrill.so
 
 @]
 	end