diff --git a/src/java/DmWebPortal/Makefile b/src/java/DmWebPortal/Makefile
index 5d28dc150fc9c004c7a659461d05dd3df938a21f..d4bddb4d18470f97634997ba5de642c70364acc4 100644
--- a/src/java/DmWebPortal/Makefile
+++ b/src/java/DmWebPortal/Makefile
@@ -8,16 +8,19 @@ all install: dist
 
 clean clean-all clean-install distclean: ant-clean
 
+.PHONY: propertiesFile
+propertiesFile:
+	if [ ! -f $(BUILD_PROPERTIES_FILE) ]; then cmd="cat $(GENERIC_BUILD_PROPERTIES_FILE) | sed 's?DM_GLASSFISH_DIR?$${DM_GLASSFISH_DIR}?g' > $(BUILD_PROPERTIES_FILE)" && eval $$cmd ; fi
+
 .PHONY: ant-clean
-ant-clean:
+ant-clean: propertiesFile
 	$(ANT) $(ANT_ARGS)  clean
 
 # For compiling from command line, we have to use generic build properties file
 .PHONY: dist
-dist: 
-	mv $(BUILD_PROPERTIES_FILE) $(BUILD_PROPERTIES_FILE).orig
+dist: propertiesFile
+	if [ -f $(BUILD_PROPERTIES_FILE) ]; then mv $(BUILD_PROPERTIES_FILE) $(BUILD_PROPERTIES_FILE).orig; fi
 	cmd="cat $(GENERIC_BUILD_PROPERTIES_FILE) | sed 's?DM_GLASSFISH_DIR?$${DM_GLASSFISH_DIR}?g' > $(BUILD_PROPERTIES_FILE)" && eval $$cmd
 	$(ANT) $(ANT_ARGS) dist 
-	mv $(BUILD_PROPERTIES_FILE).orig $(BUILD_PROPERTIES_FILE)
-
+	if [ -f $(BUILD_PROPERTIES_FILE).orig ]; then mv $(BUILD_PROPERTIES_FILE).orig $(BUILD_PROPERTIES_FILE); fi