summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2012-06-07 08:20:09 +0100
committerSteve Hay <steve.m.hay@googlemail.com>2012-06-07 08:20:09 +0100
commit84ee0a66f289b99c3c892aea8a9748ba7a3b2513 (patch)
tree90699d0f5582210464926eec985ef79e0aab6b25
parent662a27517b774fb0b240784bd97ebc123dcfed02 (diff)
downloadperl-84ee0a66f289b99c3c892aea8a9748ba7a3b2513.tar.gz
Remove INST_DRV from Windows makefiles' CFG_VARS
It isn't directly used by config_sh.PL, and the only appearance of it in a config.xxx file was config.ce, where it was surely wrong: prefixexp should be a ~name expanded version of prefix, so just set it to ~INST_TOP~ like the other config.xxx files all do.
-rw-r--r--win32/Makefile1
-rw-r--r--win32/Makefile.ce1
-rw-r--r--win32/config.ce2
-rw-r--r--win32/makefile.mk1
4 files changed, 1 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 8025ec778d..afc4dce0c8 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -768,7 +768,6 @@ STATIC_EXT = Win32CORE
DYNALOADER = ..\DynaLoader$(o)
CFG_VARS = \
- "INST_DRV=$(INST_DRV)" \
"INST_TOP=$(INST_TOP)" \
"INST_VER=$(INST_VER)" \
"INST_ARCH=$(INST_ARCH)" \
diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index 2f150d578d..3ae055cb7e 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -670,7 +670,6 @@ EXTENSION_PM = \
$(ERRNO_PM)
CFG_VARS = \
- "INST_DRV=$(INST_DRV)" \
"INST_TOP=$(INST_TOP)" \
"INST_VER=$(INST_VER)" \
"INST_ARCH=$(INST_ARCH)" \
diff --git a/win32/config.ce b/win32/config.ce
index c963e827db..3a8add7b94 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -833,7 +833,7 @@ plibpth=''
pmake=''
pr=''
prefix='~INST_TOP~'
-prefixexp='~INST_DRV~'
+prefixexp='~INST_TOP~'
privlib='~INST_TOP~~INST_VER~\lib'
privlibexp='~INST_TOP~~INST_VER~\lib'
procselfexe=''
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 2dfd2e1918..5914486ec9 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -881,7 +881,6 @@ DYNALOADER = ..\DynaLoader$(o)
# trying to fit them all on the command line)
# -- BKS 10-17-1999
CFG_VARS = \
- INST_DRV=$(INST_DRV) ~ \
INST_TOP=$(INST_TOP) ~ \
INST_VER=$(INST_VER) ~ \
INST_ARCH=$(INST_ARCH) ~ \