[vhffs-dev] [1078] Allow installation of public part without panel

[subversion@xxxxxxxxxxxxx]

Revision: 1078
Author:   beuss
Date:     2007-11-12 19:21:29 +0000 (Mon, 12 Nov 2007)

Log Message:
-----------
Allow installation of public part without panel

Modified Paths:
--------------
    trunk/vhffs-panel/Makefile.am
    trunk/vhffs-themes/Makefile.am


Modified: trunk/vhffs-panel/Makefile.am
===================================================================
--- trunk/vhffs-panel/Makefile.am	2007-11-12 19:13:49 UTC (rev 1077)
+++ trunk/vhffs-panel/Makefile.am	2007-11-12 19:21:29 UTC (rev 1078)
@@ -1,3 +1,8 @@
+javascripts = js/prototype.js \
+    js/commons.js \
+	js/tooltip.js
+
+
 if INSTALL_PANEL
 SUBDIRS = templates
 
@@ -2,12 +7,4 @@
 paneljsdir= @PANELDIR@
-nobase_paneljs_DATA = js/prototype.js \
-	js/commons.js \
-	js/tooltip.js
+nobase_paneljs_DATA = $(javascripts)
 
-if INSTALL_PUBLIC
-publicjsdir = @PUBLICDIR@
-nobase_publicjs_DATA = $(nobase_paneljs_DATA)
-endif
-
-
 paneldir = @PANELDIR@
@@ -144,3 +141,10 @@
 	done
 
 endif # Install panel
+
+if INSTALL_PUBLIC
+publicjsdir = @PUBLICDIR@
+nobase_publicjs_DATA = $(javascripts)
+endif
+
+

Modified: trunk/vhffs-themes/Makefile.am
===================================================================
--- trunk/vhffs-themes/Makefile.am	2007-11-12 19:13:49 UTC (rev 1077)
+++ trunk/vhffs-themes/Makefile.am	2007-11-12 19:21:29 UTC (rev 1078)
@@ -1,7 +1,4 @@
-if INSTALL_PANEL
-
-panelthemesdir = @PANELDIR@/themes
-nobase_panelthemes_DATA = \
+themesfiles = \
 	vhffs/images/admin.png \
 	vhffs/images/black.png \
 	vhffs/images/bug.png \
@@ -73,9 +70,15 @@
 	vhffs/images/webs.png \
 	vhffs/main.css
 
+
+
+if INSTALL_PANEL
+
+panelthemesdir = @PANELDIR@/themes
+nobase_panelthemes_DATA = $(themesfiles)
 endif # Install panel
 
 if INSTALL_PUBLIC
 publicthemesdir = @PUBLICDIR@/themes
-nobase_publicthemes_DATA = $(nobase_panelthemes_DATA)
+nobase_publicthemes_DATA = $(themesfiles)
 endif