Add --program-suffix option to configure

3 files changed, 8 insertions, 11 deletions

diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 5886ad5bb..e9320ce02 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -2,9 +2,7 @@
 
 %{commands_in}
 
-# Targets
-APP           = %{app_prefix}botan
-TEST          = %{app_prefix}botan-test
+# Library targets
 LIBRARIES     = $(STATIC_LIB)
 
 LIBNAME       = %{lib_prefix}libbotan
@@ -12,8 +10,6 @@ STATIC_LIB    = $(LIBNAME)-$(BRANCH).a
 
 LIBPATH       = botan-$(BRANCH)
 
-all: $(APP) $(TEST)
-
 # File Lists
 INCLUDE_DIR   = %{botan_include_dir}
 
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index 5f81fa0a5..c481f65f3 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -30,3 +30,9 @@ PKGCONF_DIR    = $(LIBDIR)/pkgconfig
 
 CONFIG_SCRIPT = %{botan_config}
 PKGCONFIG     = %{botan_pkgconfig}
+
+# Executable targets
+APP           = %{app_prefix}botan%{program_suffix}
+TEST          = %{app_prefix}botan-test%{program_suffix}
+
+all: $(APP) $(TEST)
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 9ab563b1a..f45690d06 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -13,10 +13,7 @@ RM            = @del /Q
 RM_R          = $(RM) /S
 RMDIR         = @rmdir
 
-### File Lists
-APP          = %{app_prefix}botan
-TEST         = %{app_prefix}botan-test
-
+### Library targets
 LIBOBJS       = %{lib_objs}
 
 APPOBJS       = %{app_objs}
@@ -30,8 +27,6 @@ LIBRARIES     = $(BOTAN_LIB)
 # This will be either a static lib or the DLL import lib
 BOTAN_LIB     = $(LIBNAME).%{static_suffix}
 
-all: $(APP) $(TEST)
-
 # Build Commands
 %{lib_build_cmds}