Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Renamed store_tab to extensions. Trying to avoid needless recompilation.

  • Loading branch information...
commit 01f477b59f128f6a23dd6fc66317af984d54c16c 1 parent 9b51b84
authored August 26, 2009
2  Makedefs.in
@@ -47,4 +47,4 @@ JAVA_HOME       = @JAVA_HOME@
47 47
 
48 48
 # compile time configurations
49 49
 euca_theme	= @INTERFACE_THEME@
50  
-store_tab	= @STORE@
  50
+extensions	= @EXTENSIONS@
8  clc/Makefile
@@ -10,6 +10,9 @@ all: build
10 10
 deps:
11 11
 	$(ANT) deps
12 12
 
  13
+update_properties:
  14
+	@sed -i "s/\(^extensions =\).*/\1 ${extensions}/" ${TOP}/clc/modules/www/conf/eucalyptus-web.properties
  15
+
13 16
 themes:
14 17
 	@if test -n ${euca_theme} ; then \
15 18
 		if test -d ${theme_dir}/${euca_theme} ; then \
@@ -18,9 +21,8 @@ themes:
18 21
 		else \
19 22
 			echo "Theme ${euca_theme} does not exists!"; exit 1;\
20 23
 		fi; fi
21  
-	@if test ${store_tab} = "Y" ; then \
22  
-		 sed -i "s/\(^extensions =\).*/\1 store/" ${TOP}/clc/modules/www/conf/eucalyptus-web.properties ; else \
23  
-		 sed -i "s/\(^extensions =\).*/\1/" ${TOP}/clc/modules/www/conf/eucalyptus-web.properties; fi
  24
+	@
  25
+	@if test "`grep '^extensions' ${TOP}/clc/modules/www/conf/eucalyptus-web.properties | sed 's/extensions =[[:blank:]]*//'` != '${extensions}'" > /dev/null ; then $(MAKE) update_properties; fi
24 26
 
25 27
 build: themes
26 28
 	@# we need JAVA_HOME
8,210  configure
2242 additions, 5968 deletions not shown
6  configure.ac
@@ -33,7 +33,7 @@ AXIS2_HOME="${AXIS2_HOME}"
33 33
 AXIS2C_SERVICES=""
34 34
 LIBVIRT_HOME="${LIBVIRT_HOME}"
35 35
 INTERFACE_THEME="eucalyptus"
36  
-STORE="N"
  36
+EXTENSIONS=""
37 37
 ANT=""
38 38
 JAVA=""
39 39
 WSDL2C=""
@@ -68,7 +68,7 @@ AC_ARG_WITH(interface-theme,
68 68
 AC_ARG_ENABLE(appliance-store,
69 69
         [  --enable-appliance-store             enable the store tab],
70 70
                 [if test "${enableval}" != "no"; then
71  
-                        STORE="Y"
  71
+                        EXTENSIONS="store"
72 72
                 fi])
73 73
 
74 74
 AC_ARG_ENABLE(debug,
@@ -242,7 +242,7 @@ AC_SUBST(CFLAGS)
242 242
 AC_SUBST(LDFLAGS)
243 243
 AC_SUBST(LIBS)
244 244
 AC_SUBST(INCLUDES)
245  
-AC_SUBST(STORE)
  245
+AC_SUBST(EXTENSIONS)
246 246
 AC_SUBST(INTERFACE_THEME)
247 247
 
248 248
 

0 notes on commit 01f477b

Please sign in to comment.
Something went wrong with that request. Please try again.