[Cluster-devel] conga/luci cluster/Makefile homebase/Makefile ...
rmccabe at sourceware.org
rmccabe at sourceware.org
Fri Jul 14 20:01:41 UTC 2006
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/*"
More information about the Cluster-devel
mailing list