From ed3c84d8a324f647b798652dd6dd4440935a18eb Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Wed, 1 Oct 2014 03:19:43 +0000
Subject: [PATCH] fix generic build
---
src/java/DmWebPortal/Makefile | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/java/DmWebPortal/Makefile b/src/java/DmWebPortal/Makefile
index 5d28dc15..d4bddb4d 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
--
GitLab