summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in13
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e538d51c..16229693f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-04 Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
+
+ * 12736: configure.in: Fix `make install' dependency
+ for Cygwin static build
+
2000-09-04 Peter Stephenson <pws@csr.com>
* Config/version.mk: 3.1.9-dev-6
diff --git a/configure.in b/configure.in
index 0b46b2d0b..b381d2220 100644
--- a/configure.in
+++ b/configure.in
@@ -1463,6 +1463,8 @@ dnl ---------------
dnl dynamic loading
dnl ---------------
L=N
+INSTLIB="install.bin-\$(L)"
+UNINSTLIB="uninstall.bin-\$(L)"
LINKMODS=NOLINKMODS
MOD_EXPORT=
MOD_IMPORT_VARIABLE=
@@ -1687,6 +1689,10 @@ if test "x$dynamic" = xyes; then
if $strip_libldflags && test "$zsh_cv_sys_dynamic_strip_lib" = yes; then
LIBLDFLAGS="$LIBLDFLAGS -s"
fi
+ if test "x$ac_cv_cygwin" = xyes; then
+ INSTLIB="install.cygwin-lib"
+ UNINSTLIB="uninstall.cygwin-lib"
+ fi
else
$strip_exeldflags && EXELDFLAGS="$EXELDFLAGS -s"
$strip_libldflags && LIBLDFLAGS="$LIBLDFLAGS -s"
@@ -1714,13 +1720,6 @@ else
fi
AC_SUBST(SHORTBOOTNAMES)
-if test "x$ac_cv_cygwin" = xyes; then
- INSTLIB="install.cygwin-lib"
- UNINSTLIB="uninstall.cygwin-lib"
-else
- INSTLIB="install.bin-\$(L)"
- UNINSTLIB="uninstall.bin-\$(L)"
-fi
AC_SUBST(INSTLIB)dnl
AC_SUBST(UNINSTLIB)dnl