Index: trunk/Makefile.conf.in =================================================================== --- trunk/Makefile.conf.in (revision 2514) +++ trunk/Makefile.conf.in (revision 2515) @@ -5,8 +5,8 @@ BINDIR=$(install_root)@/local/prefix@/bin ETCDIR=$(install_root)/etc DATADIR=$(install_root)@/local/prefix@/share/pcb-rnd -RM=@fstools/rm@ -CP=@fstools/cp@ -LN=@fstools/ln@ -MKDIR=@fstools/mkdir@ +RM=@/host/fstools/rm@ +CP=@/host/fstools/cp@ +LN=@/host/fstools/ln@ +MKDIR=@/host/fstools/mkdir@ @] Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 2514) +++ trunk/scconfig/hooks.c (revision 2515) @@ -132,6 +132,13 @@ /* Runs when things should be detected for the host system */ int hook_detect_host() { + require("fstools/ar", 0, 1); + require("fstools/mkdir", 0, 1); + require("fstools/rm", 0, 1); + require("fstools/cp", 0, 1); + require("fstools/ln", 0, 1); + require("fstools/mkdir", 0, 1); + return 0; } @@ -158,7 +165,6 @@ want_stroke = plug_is_enabled("stroke"); require("cc/fpic", 0, 1); - require("fstools/mkdir", 0, 1); if (want_intl) { require("libs/sul/gettext/presents", 0, 0); @@ -235,9 +241,11 @@ else { report("No need for glib, skipping GLIB detection\n"); put("libs/sul/glib/presents", "false"); + put("libs/sul/glib/cflags", ""); + put("libs/sul/glib/ldflags", ""); } - if (isfalse(get("libs/sul/glib/presents"))) { + if (!istrue(get("libs/sul/glib/presents"))) { /* Makefile templates will still reference these variables, they should be empty */ put("libs/sul/glib/cflags", ""); put("libs/sul/glib/ldflags", ""); @@ -274,11 +282,6 @@ } /* generic utils for Makefiles */ - require("fstools/rm", 0, 1); - require("fstools/ar", 0, 1); - require("fstools/cp", 0, 1); - require("fstools/ln", 0, 1); - require("fstools/mkdir", 0, 1); require("sys/ext_exe", 0, 1); require("sys/sysid", 0, 1); Index: trunk/src_3rd/gts/Makefile.in =================================================================== --- trunk/src_3rd/gts/Makefile.in (revision 2514) +++ trunk/src_3rd/gts/Makefile.in (revision 2515) @@ -47,10 +47,10 @@ CC=@cc/cc@ libgts.a: $(OBJS) - @fstools/ar@ rvu libgts.a $(OBJS) + @/host/fstools/ar@ rvu libgts.a $(OBJS) clean: - -@fstools/rm@ $(OBJS) libgts.a + -@/host/fstools/rm@ $(OBJS) libgts.a @] # generate explicit rules for .c -> .o