summaryrefslogtreecommitdiff
path: root/os2
diff options
context:
space:
mode:
Diffstat (limited to 'os2')
-rw-r--r--os2/Makefile.SHs10
-rw-r--r--os2/os2.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index c9bf39a1e2..ced556af9e 100644
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -6,17 +6,17 @@
# Additional rules supported: perl_, aout_test, aout_install, use them
# for a.out style perl (which may fork).
-perl_version="5.00${PATCHLEVEL}_$SUBVERSION"
+perl_fullversion="5.00${PERL_VERSION}_$PERL_SUBVERSION"
case "$archname" in
- *-thread*) perl_version="${perl_version}-threaded";;
+ *-thread*) perl_fullversion="${perl_fullversion}-threaded";;
esac
-dll_post="`echo $perl_version | sum | awk '{print $1}'`"
+dll_post="`echo $perl_fullversion | sum | awk '{print $1}'`"
dll_post="`printf '%x' $dll_post | tr '[a-z]' '[A-Z]'`"
$spitshell >>Makefile <<!GROK!THIS!
-PERL_VERSION = $perl_version
+PERL_FULLVERSION = $perl_fullversion
OPTIMIZE = $optimize
AOUT_OPTIMIZE = \$(OPTIMIZE)
@@ -60,7 +60,7 @@ $(PERL_DLL): $(obj) perl5.def perl$(OBJ_EXT)
perl5.def: perl.linkexp
echo "LIBRARY '$(PERL_DLL_BASE)' INITINSTANCE TERMINSTANCE" > $@
- echo DESCRIPTION "'Perl interpreter v$(PERL_VERSION), export autogenerated, built with $(CONFIG_ARGS)'" >>$@
+ echo DESCRIPTION "'Perl interpreter v$(PERL_FULLVERSION), export autogenerated, built with $(CONFIG_ARGS)'" >>$@
echo STACKSIZE 32768 >>$@
echo CODE LOADONCALL >>$@
echo DATA LOADONCALL NONSHARED MULTIPLE >>$@
diff --git a/os2/os2.c b/os2/os2.c
index 7084074344..3103012df2 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -1315,7 +1315,7 @@ mod2fname(sv)
#ifdef USE_THREADS
sum++; /* Avoid conflict of DLLs in memory. */
#endif
- sum += PATCHLEVEL * 200 + SUBVERSION * 2; /* */
+ sum += PERL_VERSION * 200 + PERL_SUBVERSION * 2; /* */
fname[pos] = 'A' + (sum % 26);
fname[pos + 1] = 'A' + (sum / 26 % 26);
fname[pos + 2] = '\0';