Index: trunk/Makefile.conf.in =================================================================== --- trunk/Makefile.conf.in (revision 25709) +++ trunk/Makefile.conf.in (revision 25710) @@ -19,6 +19,11 @@ EXE=@/target/sys/ext_exe@ PCB_RND_HOST_CC=@/host/cc/cc@ +# hidlib installation directories +HL_LIBDIR=$(Install_root)@/local/prefix@/@/local/libarchdir@ +HL_INCDIR=$(Install_root)@/local/prefix@/include/pcb-rnd + + # The installation directoried to be used from within binaries (with # install_root/DESTDIR removed) LIBDIR_INSTALLED=@/local/prefix@/lib/pcb-rnd Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 25709) +++ trunk/scconfig/hooks.c (revision 25710) @@ -70,6 +70,7 @@ printf(" --dot_pcb_pcb=path .pcb-rnd config path under $HOME/\n"); printf(" --workaround-gtk-ctrl enable GTK control key query workaround\n"); printf(" --man1dir=path change installation path of man1 files (under prefix)\n"); + printf(" --libarchdir=relpath relative path under prefix for arch-lib-dir (e.g. lib64)\n"); printf(" --all=plugin enable all working plugins for dynamic load\n"); printf(" --all=buildin enable all working plugins for static link\n"); printf(" --all=disable disable all plugins (compile core only)\n"); @@ -147,6 +148,10 @@ put("/local/man1dir", value); return 1; } + if (strcmp(key, "libarchdir") == 0) { + put("/local/libarchdir", value); + return 1; + } if (strncmp(key, "workaround-", 11) == 0) { const char *what = key+11; if (strcmp(what, "gtk-ctrl") == 0) append("/local/pcb/workaround_defs", "\n#define PCB_WORKAROUND_GTK_CTRL 1"); @@ -287,6 +292,7 @@ put("/local/prefix", "/usr/local"); put("/local/man1dir", "/share/man/man1"); put("/local/man1dir", "/share/man/man1"); + put("/local/libarchdir", "lib"); put("/local/pcb/hid_gtk3_cairo/controls", sfalse); /* enable gtk3 only when explicitly requested */ #undef plugin_def