3 files changed, 4 insertions, 7 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 6b2703cb7..75ea3d508 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -53,8 +53,8 @@ clean:
 	$(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(APP) $(TEST)
 
 distclean: clean
+	$(RM) Makefile
 	$(RM_R) %{build_dir}
-	$(RM) Makefile* $(CONFIG_SCRIPT) $(PKGCONFIG)
 	$(RM) botan_all.cpp botan_all.h
 
 docs:
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index 86d4c65c5..45f64e303 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -32,9 +32,6 @@ HEADERDIR      = $(DESTDIR)/%{includedir}/botan-$(BRANCH)/botan
 DOCDIR         = $(DESTDIR)/%{docdir}/botan-$(VERSION)
 PKGCONF_DIR    = $(LIBDIR)/pkgconfig
 
-CONFIG_SCRIPT = %{botan_config}
-PKGCONFIG     = %{botan_pkgconfig}
-
 # Executable targets
 APP           = %{out_dir}/botan%{program_suffix}
 TEST          = %{out_dir}/botan-test%{program_suffix}
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 95d8c0422..69c6a24ca 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -36,16 +36,16 @@ BOTAN_LIB     = $(LIBNAME).%{static_suffix}
 
 # Link Commands
 $(APP): $(LIBRARIES) $(APPOBJS)
-	$(CXX) /Fe$@ $(APPOBJS) $(BOTAN_LIB) $(LINK_TO)
+	$(CXX) /Fe$@ $(APPOBJS) $(BOTAN_LIB) $(APP_LINKS_TO)
 
 $(TEST): $(LIBRARIES) $(TESTOBJS)
-	$(CXX) /Fe$@ $(TESTOBJS) $(BOTAN_LIB) $(LINK_TO)
+	$(CXX) /Fe$@ $(TESTOBJS) $(BOTAN_LIB) $(TEST_LINKS_TO)
 
 $(BOTAN_LIB): $(LIBOBJS)
 !If "$(SO_OBJ_FLAGS)" == ""
 	$(AR) /OUT:$(BOTAN_LIB) $(LIBOBJS)
 !Else
-	$(LIB_LINK_CMD) /Fe$(LIBNAME) $(LIBOBJS) $(LINK_TO)
+	$(LIB_LINK_CMD) /Fe$(LIBNAME) $(LIBOBJS) $(LIB_LINKS_TO)
 !Endif
 
 %{python_in}