cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile  ...
Date: 14 Jul 2006 20:01:41 -0000	[thread overview]
Message-ID: <20060714200141.7269.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-07-14 20:01:41

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

Log message:
	ability to specify files for make import with, e.g., make import FILES=file.jpg

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

--- conga/luci/cluster/Makefile	2006/07/05 17:41:23	1.2
+++ conga/luci/cluster/Makefile	2006/07/14 20:01:40	1.3
@@ -5,7 +5,11 @@
 
 # import page local page templates to the Luci server
 import:
-	@find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/
+	@if test $(FILES); then \
+		../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ $(FILES) ; \
+	else \
+		find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/cluster/ ; \
+	fi
 
 export:
 	@wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/cluster/*"
--- conga/luci/homebase/Makefile	2006/07/05 17:41:23	1.2
+++ conga/luci/homebase/Makefile	2006/07/14 20:01:40	1.3
@@ -5,7 +5,11 @@
 
 # import page local page templates to the Luci server
 import:
-	@find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/
+	@if test $(FILES); then \
+		../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ $(FILES) ; \
+	else \
+		find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/homebase/ ; \
+	fi
 
 export:
 	@wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/homebase/*"
--- conga/luci/storage/Makefile	2006/07/05 17:41:23	1.2
+++ conga/luci/storage/Makefile	2006/07/14 20:01:41	1.3
@@ -5,7 +5,11 @@
 
 # import page local page templates to the Luci server
 import:
-	@find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/
+	@if test $(FILES); then \
+		../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ $(FILES) ; \
+	else \
+		find . -follow -maxdepth 1 -type f -not -name Makefile -not -name ".*" -print0 | xargs -0 ../load_site.py -u $(LUCI_USER):$(LUCI_PASS) $(LUCI_HTTP)/storage/ ; \
+	fi
 
 export:
 	@wget -q -r -nH --cut-dirs=2 "ftp://$(LUCI_USER):$(LUCI_PASS)@$(LUCI_FTP)/luci/storage/*"



             reply	other threads:[~2006-07-14 20:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-14 20:01 rmccabe [this message]
  -- strict thread matches above, loose matches on Subject: below --
2006-07-14 20:08 [Cluster-devel] conga/luci cluster/Makefile homebase/Makefile rmccabe
2006-08-16 14:59 rmccabe
2006-10-05 15:01 kupcevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060714200141.7269.qmail@sourceware.org \
    --to=rmccabe@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).