Index: trunk/scconfig/Makefile =================================================================== --- trunk/scconfig/Makefile (revision 8150) +++ trunk/scconfig/Makefile (revision 8151) @@ -84,7 +84,7 @@ menucfg.o: menucfg.c $(CC) -c $(CFLAGS) -o menucfg.o menucfg.c -hooks.o: plugin_3state.h plugins.h Rev.h +hooks.o: plugin_3state.h plugins.h Rev.h ../src_3rd/puplug/scconfig_hooks.h src/util/arg_auto_set.o: src/util/arg_auto_set.c src/util/arg_auto_set.h $(CC) -c $(CFLAGS) -o src/util/arg_auto_set.o src/util/arg_auto_set.c Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 8150) +++ trunk/scconfig/hooks.c (revision 8151) @@ -14,6 +14,8 @@ #include "plugin_3state.h" +#include "../src_3rd/puplug/scconfig_hooks.h" + int want_intl = 0, want_coord_bits; const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */ @@ -90,6 +92,7 @@ } if (strcmp(key, "debug") == 0) { put("/local/pcb/debug", strue); + pup_set_debug(strue); return 1; } if (strcmp(key, "symbols") == 0) { @@ -212,6 +215,8 @@ db_mkdir("/local"); db_mkdir("/local/pcb"); + pup_hook_postinit(); + /* DEFAULTS */ put("/local/prefix", "/usr/local"); @@ -272,6 +277,8 @@ /* Runs when things should be detected for the host system */ int hook_detect_host() { + pup_hook_detect_host(); + require("fstools/ar", 0, 1); require("fstools/mkdir", 0, 1); require("fstools/rm", 0, 1); @@ -310,6 +317,8 @@ want_cairo = plug_is_enabled("export_bboard") | want_gtk3; want_xml2 = plug_is_enabled("io_eagle"); + pup_hook_detect_target(); + require("cc/fpic", 0, 1); require("signal/names/*", 0, 0); require("libs/env/setenv/*", 0, 0); @@ -742,8 +751,10 @@ { char *rev = "non-svn", *tmp; int generr = 0; - int res = 0; + int res; + res = pup_hook_generate("../src_3rd/puplug"); + tmp = svn_info(0, "../src", "Revision:"); if (tmp != NULL) { rev = str_concat("", "svn r", tmp, NULL);