5 files changed, 6 insertions, 6 deletions
diff --git a/Src/Makefile.in b/Src/Makefile.in
index 5126a2b7c..2fd48a151 100644
--- a/Src/Makefile.in
+++ b/Src/Makefile.in
@@ -82,11 +82,11 @@ EXTRAZSHOBJS = @EXTRAZSHOBJS@
 
 zsh$(EXEEXT): $(@L@IBZSH) $(@L@STMP) $(MAIN_OBJS) zsh.export $(EXTRAZSHOBJS)
 	rm -f $@
-	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(EXTRAZSHOBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(LIBS_M) $(LIBS_TERMCAP) $(LIBS_YP) $(LIBS)
+	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(EXTRAZSHOBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(MAINLIBS)
 
 $(LIBZSH): $(LIBOBJS) $(NSTMP)
 	rm -f $@
-	$(DLLINK) $(LIBOBJS) $(NLIST) $(LIBS_M) $(LIBS_TERMCAP) $(LIBS)
+	$(DLLINK) $(LIBOBJS) $(NLIST) $(MAINLIBS)
 
 zsh.res.o: $(sdir)/zsh.rc $(sdir)/zsh.ico
 	windres -O coff --include-dir $(sdir) -i $(sdir)/zsh.rc -o zsh.res.o
diff --git a/Src/Modules/cap.mdd b/Src/Modules/cap.mdd
index df4a52c4c..0393f7f38 100644
--- a/Src/Modules/cap.mdd
+++ b/Src/Modules/cap.mdd
@@ -6,4 +6,4 @@ autobins="cap getcap setcap"
 
 objects="cap.o"
 
-#extralibs="cap"
+extralibs="cap"
diff --git a/Src/Modules/termcap.mdd b/Src/Modules/termcap.mdd
index f50fb59a1..4c33f5690 100644
--- a/Src/Modules/termcap.mdd
+++ b/Src/Modules/termcap.mdd
@@ -16,4 +16,4 @@ autobins="echotc"
 
 objects="termcap.o"
 
-#extralibs="termcap"
+extralibs="termcap"
diff --git a/Src/Modules/terminfo.mdd b/Src/Modules/terminfo.mdd
index 2525eda57..0eca9ddfb 100644
--- a/Src/Modules/terminfo.mdd
+++ b/Src/Modules/terminfo.mdd
@@ -17,4 +17,4 @@ autoparams="terminfo"
 
 objects="terminfo.o"
 
-#extralibs="terminfo"
+extralibs="terminfo"
diff --git a/Src/Modules/zftp.mdd b/Src/Modules/zftp.mdd
index 504984ed2..0e11a72d6 100644
--- a/Src/Modules/zftp.mdd
+++ b/Src/Modules/zftp.mdd
@@ -7,4 +7,4 @@ autobins="zftp"
 
 objects="zftp.o"
 
-#extralibs="socket"
+extralibs="socket"