diff options
| author | Michael G Schwern <schwern@pobox.com> | 2000-03-05 01:31:29 -0500 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-03-05 22:05:54 +0000 |
| commit | 526fdc24ad2c51ba7f2a58c871a45d948bdfe8e3 (patch) | |
| tree | 4efbbea89f7bd201bb79bc04187ce371493229b3 /vos/config_h.SH_orig | |
| parent | 7bf3502ff8e7c997421ba8258c4ee60453dd68b3 (diff) | |
| download | perl-526fdc24ad2c51ba7f2a58c871a45d948bdfe8e3.tar.gz | |
sitelib_stem and vendorlib_stem patches from Andy;
problem reported in
To: perl5-porters@perl.org
Subject: [ID 20000305.001] [BUG 5.5.670 perl.c] SITELIB_EXP mangled by hack.
Message-Id: <20000305113129.80DC23820@athens.arena-i.com>
p4raw-id: //depot/cfgperl@5559
Diffstat (limited to 'vos/config_h.SH_orig')
| -rwxr-xr-x | vos/config_h.SH_orig | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig index d452aa9fa1..cae08f30dd 100755 --- a/vos/config_h.SH_orig +++ b/vos/config_h.SH_orig @@ -1204,14 +1204,18 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- * This macro surrounds its token with double quotes. */ #if $cpp_stuff == 1 -#define CAT2(a,b)a/**/b -#define STRINGIFY(a)"a" +# define CAT2(a,b) a/**/b +# define STRINGIFY(a) "a" /* If you can get stringification with catify, tell me how! */ #endif #if $cpp_stuff == 42 -#define CAT2(a,b)a ## b -#define StGiFy(a)# a -#define STRINGIFY(a)StGiFy(a) +# define PeRl_CaTiFy(a, b) a ## b +# define PeRl_StGiFy(a) #a +/* the additional level of indirection enables these macros to be + * used as arguments to other macros. See K&R 2nd ed., page 231. */ +# define CAT2(a,b) PeRl_CaTiFy(a,b) +# define StGiFy(a) PeRl_StGiFy(a) +# define STRINGIFY(a) PeRl_StGiFy(a) #endif #if $cpp_stuff != 1 && $cpp_stuff != 42 #include "Bletch: How does this C preprocessor catenate tokens?" @@ -2806,8 +2810,14 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- * This symbol contains the ~name expanded version of SITELIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ +/* SITELIB_STEM: + * This define is SITELIB_EXP with any trailing version-specific component + * removed. The elements in inc_version_list (inc_version_list.U) can + * be tacked onto this variable to generate a list of directories to search. + */ #define SITELIB "$sitelib" /**/ #define SITELIB_EXP "$sitelibexp" /**/ +#define SITELIB_STEM "$sitelib_stem" /**/ /* Size_t: * This symbol holds the type used to declare length parameters @@ -2956,11 +2966,23 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- #endif #$d_oldpthreads OLD_PTHREADS_API /**/ +/* PERL_VENDORARCH_EXP: + * This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +#$d_vendorarch PERL_VENDORARCH_EXP "$vendorarchexp" /**/ + /* PERL_VENDORLIB_EXP: * This symbol contains the ~name expanded version of VENDORLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ +/* PERL_VENDORLIB_STEM: + * This define is PERL_VENDORLIB_EXP with any trailing version-specific component + * removed. The elements in inc_version_list (inc_version_list.U) can + * be tacked onto this variable to generate a list of directories to search. + */ #$d_vendorlib PERL_VENDORLIB_EXP "$vendorlibexp" /**/ +#$d_vendorlib PERL_VENDORLIB_STEM "$vendorlib_stem" /**/ /* VOIDFLAGS: * This symbol indicates how much support of the void type is given by this |