From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 5 Jul 2006 17:41:24 -0000
Subject: [Cluster-devel] conga/luci Makefile cluster/Makefile homebase/ ...
Message-ID: <20060705174124.6720.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-07-05 17:41:24

Modified files:
	luci           : Makefile 
	luci/cluster   : Makefile 
	luci/homebase  : Makefile 
	luci/storage   : Makefile 

Log message:
	makefile tweaks

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2

--- conga/luci/Makefile	2006/06/30 18:42:16	1.8
+++ conga/luci/Makefile	2006/07/05 17:41:22	1.9
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 2006/06/30 18:42:16 rmccabe Exp $
+# $Id: Makefile,v 1.9 2006/07/05 17:41:22 rmccabe Exp $
 ZOPEINSTANCE=/var/lib/luci
 
 
@@ -46,19 +46,19 @@
 	make -C storage import
 
 export_storage:
-	make -C storage export
+	make -C -e storage export
 
 import_cluster:
-	make -C cluster import
+	make -C -e cluster import
 
 export_cluster:
-	make -C cluster export
+	make -C -e cluster export
 
 import_homebase:
-	make -C homebase import
+	make -C -e homebase import
 
 export_homebase:
-	make -C homebase export
+	make -C -e homebase export
 
 import_pts: import_storage import_cluster import_homebase
 export_pts: export_storage export_cluster export_homebase
--- conga/luci/cluster/Makefile	2006/06/30 18:42:16	1.1
+++ conga/luci/cluster/Makefile	2006/07/05 17:41:23	1.2
@@ -1,7 +1,7 @@
 LUCI_USER=admin
 LUCI_PASS=changeme
-LUCI_FTP=localhost:8021
-LUCI_HTTP=http://localhost:25639/luci
+LUCI_FTP=luci:8021
+LUCI_HTTP=http://luci:8080/luci
 
 # import page local page templates to the Luci server
 import:
--- conga/luci/homebase/Makefile	2006/06/30 18:42:17	1.1
+++ conga/luci/homebase/Makefile	2006/07/05 17:41:23	1.2
@@ -1,7 +1,7 @@
 LUCI_USER=admin
 LUCI_PASS=changeme
-LUCI_FTP=localhost:8021
-LUCI_HTTP=http://localhost:25639/luci
+LUCI_FTP=luci:8021
+LUCI_HTTP=http://luci:8080/luci
 
 # import page local page templates to the Luci server
 import:
--- conga/luci/storage/Makefile	2006/06/30 18:42:17	1.1
+++ conga/luci/storage/Makefile	2006/07/05 17:41:23	1.2
@@ -1,7 +1,7 @@
 LUCI_USER=admin
 LUCI_PASS=changeme
-LUCI_FTP=localhost:8021
-LUCI_HTTP=http://localhost:25639/luci
+LUCI_FTP=luci:8021
+LUCI_HTTP=http://luci:8080/luci
 
 # import page local page templates to the Luci server
 import: