Index: 1.1.4/src_plugins/import_sch/import_sch.c
===================================================================
--- 1.1.4/src_plugins/import_sch/import_sch.c	(revision 5760)
+++ 1.1.4/src_plugins/import_sch/import_sch.c	(revision 5761)
@@ -319,20 +319,22 @@
 			return 1;
 		}
 
-		cmd = (const char **) malloc((7 + nsources) * sizeof(char *));
+		cmd = (const char **) malloc((9 + nsources) * sizeof(char *));
 		cmd[0] = conf_import_sch.plugins.import_sch.gnetlist_program;
-		cmd[1] = "-g";
-		cmd[2] = "pcbrndfwd";
-		cmd[3] = "-o";
-		cmd[4] = tmpfile;
-		cmd[5] = "--";
+		cmd[1] = "-L";
+		cmd[2] = PCBLIBDIR;
+		cmd[3] = "-g";
+		cmd[4] = "pcbrndfwd";
+		cmd[5] = "-o";
+		cmd[6] = tmpfile;
+		cmd[7] = "--";
 		for (i = 0; i < nsources; i++)
-			cmd[6 + i] = sources[i];
-		cmd[6 + nsources] = NULL;
+			cmd[8 + i] = sources[i];
+		cmd[8 + nsources] = NULL;
 
 #ifdef DEBUG
 		printf("ActionImport:  ===========  About to run gnetlist  ============\n");
-		printf("%s %s %s %s %s %s %s ...\n", cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], cmd[5], cmd[6]);
+		printf("%s %s %s %s %s %s %s %s %s ...\n", cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], cmd[5], cmd[6], cmd[7], cmd[8]);
 #endif
 
 		if (pcb_spawnvp(cmd)) {

Property changes on: 1.1.4/src_plugins/import_sch/import_sch.c
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk/src_plugins/import_sch/import_sch.c:r5727
Index: 1.1.4/util/Makefile
===================================================================
--- 1.1.4/util/Makefile	(revision 5760)
+++ 1.1.4/util/Makefile	(revision 5761)
@@ -1,7 +1,5 @@
 # plain old hand crafted Makefile
 
-SCMDIR=$(DATADIR)/../gEDA/scheme
-
 all:
 	cd gsch2pcb-rnd && make all
 
@@ -11,10 +9,11 @@
 	cd gsch2pcb-rnd && make clean
 
 install_:
-	$(MKDIR) "$(BINDIR)" "$(LIBDIR)" "$(SCMDIR)"
+	$(MKDIR) "$(BINDIR)" "$(LIBDIR)"
 	$(CPC) "`pwd`/fp2anim" "$(BINDIR)/fp2anim"
 	$(CPC) "`pwd`/pcb-strip" "$(BINDIR)/pcb-strip"
-	$(CPC) "`pwd`/gnet-pcbrndfwd.scm" "$(SCMDIR)/gnet-pcbrndfwd.scm"
+	$(CPC) "`pwd`/gnet-pcbrndfwd.scm" "$(LIBDIR)/gnet-pcbrndfwd.scm"
+	$(CPC) "`pwd`/gnet-pcbrndfwd_elem.scm" "$(LIBDIR)/gnet-pcbrndfwd_elem.scm"
 	cd gsch2pcb-rnd && make install_ CPC="$(CPC)"
 
 install:
@@ -26,5 +25,6 @@
 uninstall:
 	$(RM) "$(BINDIR)/fp2anim"
 	$(RM) "$(BINDIR)/pcb-strip"
-	$(RM) "$(SCMDIR)/gnet-pcbrndfwd.scm"
+	$(RM) "$(LIBDIR)/gnet-pcbrndfwd.scm"
+	$(RM) "$(LIBDIR)/gnet-pcbrndfwd_elem.scm"
 	cd gsch2pcb-rnd && make uninstall

Property changes on: 1.1.4/util/Makefile
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk/util/Makefile:r5726,5729