Index: trunk/config.h.in =================================================================== --- trunk/config.h.in (revision 7967) +++ trunk/config.h.in (revision 7968) @@ -31,7 +31,7 @@ /* Package properties */ /* Name of package */ -#define PACKAGE "pcb" +#define PCB_PACKAGE "pcb" /* Name of this program's gettext domain */ #define GETTEXT_PACKAGE "pcb" @@ -174,8 +174,8 @@ #define BINDIR_TO_EXECPREFIX ".." /* Version number of package */ -#define VERSION "@/local/version@" -#define REVISION "@/local/revision@" +#define PCB_VERSION "@/local/version@" +#define PCB_REVISION "@/local/revision@" /* Define to 1 if you have the `dmalloc' library (-ldmalloc); Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 7967) +++ trunk/scconfig/Rev.h (revision 7968) @@ -1 +1 @@ -static const int myrev = 7967; +static const int myrev = 7968; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 7967) +++ trunk/scconfig/Rev.tab (revision 7968) @@ -1,3 +1,4 @@ +7968 configure clean up global namespace: rename VERSION, PACKAGE and REVISION 7967 configure rename import_hyp to io_hyp 7954 configure fp_wget configuration, edakrill integration 7720 configure new route feature Index: trunk/src/build_run.c =================================================================== --- trunk/src/build_run.c (revision 7967) +++ trunk/src/build_run.c (revision 7968) @@ -70,7 +70,7 @@ if (first_time) { first_time = 0; gds_init(&info); - gds_append_str(&info, "This is PCB-rnd " VERSION " (" REVISION ")" "\n an interactive "); + gds_append_str(&info, "This is PCB-rnd " PCB_VERSION " (" PCB_REVISION ")" "\n an interactive "); gds_append_str(&info, "printed circuit board editor\n"); gds_append_str(&info, "pcb-rnd forked from gEDA/PCB."); gds_append_str(&info, "\n\n" "PCB is by harry eaton and others\n\n"); Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 7967) +++ trunk/src/main_act.c (revision 7968) @@ -177,7 +177,7 @@ int pcb_act_PrintVersion(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y) { - printf("PCB version %s\n", VERSION); + printf("PCB version %s\n", PCB_VERSION); return 0; } @@ -195,7 +195,7 @@ " Copyright (C) 1998, 1999, 2000 Harry Eaton\n\n"); printf(" COPYRIGHT for %s (pcb-rnd) version %s:\n" " pcb-rnd, a fork of PCB with random improvements\n" - " Copyright (C) 2013, 2014, 2015, 2016, 2017 Tibor 'Igor2' Palinkas\n\n", Progname, VERSION); + " Copyright (C) 2013, 2014, 2015, 2016, 2017 Tibor 'Igor2' Palinkas\n\n", Progname, PCB_VERSION); printf(" This program is free software; you can redistribute it and/or modify\n" " it under the terms of the GNU General Public License as published by\n" " the Free Software Foundation; either version 2 of the License, or\n" Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 7967) +++ trunk/src_plugins/export_dsn/dsn.c (revision 7968) @@ -503,7 +503,7 @@ fprintf(fp, " (string_quote \")\n"); fprintf(fp, " (space_in_quoted_tokens on)\n"); fprintf(fp, " (host_cad \"gEDA pcb-rnd\")\n"); - fprintf(fp, " (host_version \"%s\")\n", VERSION); + fprintf(fp, " (host_version \"%s\")\n", PCB_VERSION); fprintf(fp, " )\n"); /* capacitance resolution descriptor [optional] */ Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 7967) +++ trunk/src_plugins/export_gerber/gerber.c (revision 7968) @@ -735,7 +735,7 @@ } /* Print a cute file header at the beginning of each file. */ fprintf(f, "G04 Title: %s, %s *\r\n", PCB_UNKNOWN(PCB->Name), PCB_UNKNOWN(group_name)); - fprintf(f, "G04 Creator: pcb-rnd " VERSION " *\r\n"); + fprintf(f, "G04 Creator: pcb-rnd " PCB_VERSION " *\r\n"); fprintf(f, "G04 CreationDate: %s *\r\n", utcTime); /* ID the user. */ Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 7967) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 7968) @@ -132,7 +132,7 @@ currenttime = time(NULL); strftime(utcTime, sizeof utcTime, fmt, gmtime(¤ttime)); - fprintf(fd, "C IPC-D-356 Netlist generated by gEDA pcb-rnd " VERSION "\nC \n"); + fprintf(fd, "C IPC-D-356 Netlist generated by gEDA pcb-rnd " PCB_VERSION "\nC \n"); fprintf(fd, "C File created on %s\nC \n", utcTime); if (PCB->Name == NULL) { fprintf(fd, "P JOB %s\n", PCB->Filename); /* Use the file name if the PCB name in not set. */ Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 7967) +++ trunk/src_plugins/export_ps/ps.c (revision 7968) @@ -472,7 +472,7 @@ * %%Creator DCS indicates the document creator, usually the name of * the document composition software. */ - fprintf(f, "%%%%Creator: PCB release: pcb-rnd " VERSION "\n"); + fprintf(f, "%%%%Creator: PCB release: pcb-rnd " PCB_VERSION "\n"); /* * %%Version DCS comment can be used to note the version and @@ -492,7 +492,7 @@ * There is currently no code in PCB to manage this revision number. * */ - fprintf(f, "%%%%Version: (PCB pcb-rnd " VERSION ") 0.0 0\n"); + fprintf(f, "%%%%Version: (PCB pcb-rnd " PCB_VERSION ") 0.0 0\n"); /* Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 7967) +++ trunk/src_plugins/export_stat/stat.c (revision 7968) @@ -84,7 +84,7 @@ #define HA_built 4 {"first_ver", "the version of pcb-rnd you first used on this board", - HID_String, 0, 0, {0, VERSION, 0}, 0, 0}, + HID_String, 0, 0, {0, PCB_VERSION, 0}, 0, 0}, #define HA_first_ver 5 {"license", "license of the design", @@ -161,9 +161,9 @@ fprintf(f, " lht_built=%s\n", (stat_values[HA_lht_built].int_value ? "yes" : "no")); fprintf(f, " orig_rnd=%s\n", (stat_values[HA_orig].int_value ? "yes" : "no")); fprintf(f, " first_ver=%s\n", stat_values[HA_first_ver].str_value); - fprintf(f, " curr_ver=%s\n", VERSION); -#ifdef REVISION - fprintf(f, " curr_rev=%s\n", REVISION); + fprintf(f, " curr_ver=%s\n", PCB_VERSION); +#ifdef PCB_REVISION + fprintf(f, " curr_rev=%s\n", PCB_REVISION); #endif fprintf(f, " }\n"); Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 7967) +++ trunk/src_plugins/hid_batch/batch.c (revision 7968) @@ -117,7 +117,7 @@ interactive = 0; if (interactive) { - printf("Entering %s version %s batch mode.\n", PACKAGE, VERSION); + printf("Entering %s version %s batch mode.\n", PCB_PACKAGE, PCB_VERSION); printf("See http://repo.hu/projects/pcb-rnd for project information\n"); } Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 7967) +++ trunk/src_plugins/io_pcb/file.c (revision 7968) @@ -207,7 +207,7 @@ static void WritePCBInfoHeader(FILE * FP) { /* write some useful comments */ - fprintf(FP, "# release: pcb-rnd " VERSION "\n"); + fprintf(FP, "# release: pcb-rnd " PCB_VERSION "\n"); /* avoid writing things like user name or date, as these cause merge * conflicts in collaborative environments using version control systems Index: trunk/src_plugins/lib_gtk_common/dlg_about.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_about.c (revision 7967) +++ trunk/src_plugins/lib_gtk_common/dlg_about.c (revision 7968) @@ -60,7 +60,7 @@ }; gtk_about_dialog_set_program_name(about, "pcb-rnd"); - gtk_about_dialog_set_version(about, VERSION); + gtk_about_dialog_set_version(about, PCB_VERSION); gtk_about_dialog_set_authors(about, authors); gtk_about_dialog_set_copyright(about, pcb_get_info_copyright()); Index: trunk/src_plugins/lib_gtk_hid/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/glue_hid.c (revision 7967) +++ trunk/src_plugins/lib_gtk_hid/glue_hid.c (revision 7968) @@ -224,8 +224,8 @@ #ifdef WIN32 char *tmps; char *libdir; - tmps = g_win32_get_package_installation_directory(PACKAGE "-" VERSION, NULL); -#define REST_OF_PATH G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "pcblib" + tmps = g_win32_get_package_installation_directory(PCB_PACKAGE "-" PCB_VERSION, NULL); +#define REST_OF_PATH G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S PCB_PACKAGE G_DIR_SEPARATOR_S "pcblib" libdir = (char *) malloc(strlen(tmps) + strlen(REST_OF_PATH) + 1); sprintf(libdir, "%s%s", tmps, REST_OF_PATH); free(tmps); @@ -272,10 +272,10 @@ #ifdef ENABLE_NLS #ifdef LOCALEDIR - bindtextdomain(PACKAGE, LOCALEDIR); + bindtextdomain(PCB_PACKAGE, LOCALEDIR); #endif - textdomain(PACKAGE); - bind_textdomain_codeset(PACKAGE, "UTF-8"); + textdomain(PCB_PACKAGE); + bind_textdomain_codeset(PCB_PACKAGE, "UTF-8"); #endif /* ENABLE_NLS */ ghidgui->topwin.com = &ghidgui->common; Index: trunk/src_plugins/lib_gtk_hid/glue_win32.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/glue_win32.c (revision 7967) +++ trunk/src_plugins/lib_gtk_hid/glue_win32.c (revision 7968) @@ -9,8 +9,8 @@ char *loader_cache; FILE *loader_file; - tmps = g_win32_get_package_installation_directory(PACKAGE "-" VERSION, NULL); -#define REST_OF_PATH G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S PACKAGE + tmps = g_win32_get_package_installation_directory(PCB_PACKAGE "-" PCB_VERSION, NULL); +#define REST_OF_PATH G_DIR_SEPARATOR_S "share" G_DIR_SEPARATOR_S PCB_PACKAGE #define REST_OF_CACHE G_DIR_SEPARATOR_S "loaders.cache" share_dir = (char *) malloc(strlen(tmps) + strlen(REST_OF_PATH) + 1); sprintf(share_dir, "%s%s", tmps, REST_OF_PATH);