Index: src/pcb-gpmi/Makefile
===================================================================
--- src/pcb-gpmi/Makefile	(revision 802)
+++ src/pcb-gpmi/Makefile	(revision 803)
@@ -3,6 +3,8 @@
 all:
 	cd gpmi_plugin; make all
 
+include ../../Makefile.conf
+PLUGIN_DIR=$(LIBDIR)/plugins
 
 clean:
 	cd gpmi_plugin; make clean
@@ -10,10 +12,15 @@
 test: all
 	cd host_lib; ./test.sh
 
+
+# TODO: temporary code until gpmi-config is fixed to generate install rules
 install:
-	cp gpmi_plugin/gpmi_plugin.so .pcb/plugins
-	cd gpmi_plugin/gpmi_pkg; ./Install.sh
+	-mkdir -p $(PLUGIN_DIR)/pcb-rnd-gpmi/
+	-cp gpmi_plugin/gpmi_plugin.so $(PLUGIN_DIR)/gpmi_plugin.so
+	cp `ls gpmi_plugin/gpmi_pkg/*.h gpmi_plugin/gpmi_pkg/*.so` $(PLUGIN_DIR)/pcb-rnd-gpmi/
 
 linstall:
-	ln -s `pwd`/gpmi_plugin/gpmi_plugin.so .pcb/plugins
-	cd gpmi_plugin/gpmi_pkg; ./Install.sh -l
+	-mkdir -p $(PLUGIN_DIR)/pcb-rnd-gpmi/
+	-ln -sf `pwd`/gpmi_plugin/gpmi_plugin.so $(PLUGIN_DIR)/gpmi_plugin.so
+	-for n in `ls gpmi_plugin/gpmi_pkg/*.h gpmi_plugin/gpmi_pkg/*.so`; do ln -sf `pwd`/$$n  $(PLUGIN_DIR)/pcb-rnd-gpmi/`basename $$n`; done
+