1 files changed, 3 insertions, 4 deletions
diff --git a/server.mk b/server.mk
index f5152730d3..8c2b7cc2c4 100644
--- a/server.mk
+++ b/server.mk
@@ -1,8 +1,7 @@
 %.server.in: %.server.in.in
-	sed -e 's|\@BINDIR\@|$(bindir)|' 			\
-	-e 's|\@LIBEXECDIR\@|$(privlibexecdir)|' 		\
-	-e 's|\@COMPONENTDIR\@|$(componentdir)|' 		\
-	-e 's|\@IMPORTERSDIR\@|$(importersdir)|' 		\
+	sed -e 's|\@BINDIR_IN_SERVER_FILE\@|$(bindir_in_server_file)|'\
+	-e 's|\@PRIVLIBEXECDIR_IN_SERVER_FILE\@|$(privlibexecdir_in_server_file)|'\
+	-e 's|\@COMPONENTDIR_IN_SERVER_FILE\@|$(componentdir_in_server_file)|'\
 	-e 's|\@VERSION\@|$(BASE_VERSION)|' 			\
 	-e 's|\@EXEEXT\@|$(EXEEXT)|'				\
 	-e 's|\@SOEXT\@|$(SOEXT)|'				\