From 6c71d5e4ddff02acdd391ddc5f0177f1d5ea980a Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 28 Dec 2013 13:36:37 +0000 Subject: [PATCH] math/gen{primes,wheel}.c: Don't use full header file name in `#include'. This makes source distributions fail badly. --- math/genprimes.c | 6 +++++- math/genwheel.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/math/genprimes.c b/math/genprimes.c index a4bf64ae..8b47ac94 100644 --- a/math/genprimes.c +++ b/math/genprimes.c @@ -52,6 +52,7 @@ int main(int argc, char *argv[]) char *header = "primetab.h"; char *source = "primetab.c"; char *name = "primetab"; + char *hdrbase; char *sym = 0; intv p = DA_INIT; int i; @@ -95,6 +96,9 @@ int main(int argc, char *argv[]) if (!p_max && !p_n) die(EXIT_FAILURE, "bad arguments to `-n' or `-m'"); + if ((hdrbase = strrchr(header, '/')) == 0) hdrbase = header; + else hdrbase++; + if (p_n || p_max >= 2) DA_PUSH(&p, 2); for (i = 3; (!p_max && !p_n) || @@ -170,7 +174,7 @@ extern const smallprime %s[];\n\ #include \"%s\"\n\ \n\ const %s %s[] = {", - header, type, name); + hdrbase, type, name); for (i = 0; i < DA_LEN(&p); i++) { if (i % 8 == 0) fputs("\n ", fp); diff --git a/math/genwheel.c b/math/genwheel.c index 94d05722..9bf3cbe1 100644 --- a/math/genwheel.c +++ b/math/genwheel.c @@ -61,6 +61,7 @@ int main(int argc, char *argv[]) const char *header = "wheel.h"; const char *name = "wheel"; const char *sym = 0; + const char *hdrbase; unsigned long i, n; unsigned long mod; int o; @@ -96,6 +97,9 @@ int main(int argc, char *argv[]) } } + if ((hdrbase = strrchr(header, '/')) == 0) hdrbase = header; + else hdrbase++; + for (mod = 1, i = 2, n = 0; n < np; i++) { @@ -173,7 +177,7 @@ extern const %s %s[];\n\ #include \"%s\"\n\ \n\ const %s %s[] = {", - header, type, name); + hdrbase, type, name); for (i = 0; i < DA_LEN(&v); i++) { if (i % 8 == 0) fputs("\n ", fp); -- 2.11.0