Skip to content
Browse files

refo

  • Loading branch information...
1 parent dba0aff commit 4451f054f5245d9ceb4ac7cb3b14f9885e297c43 @ingydotnet committed
Showing with 15 additions and 10 deletions.
  1. +12 −5 project-site.mk → Makefile.mk
  2. +0 −1 README
  3. +0 −1 SETUP
  4. +3 −3 SETUP.rst
View
17 project-site.mk → Makefile.mk
@@ -9,7 +9,7 @@ ALL_CONTENT := $(shell if [ -e content ]; then find content/ -type f | grep -v '
SITE = site
TEMPLATE = template
-PROJECT_SITE_BASE = $(MAKEFILE_LIST:%/project-site.mk=%)
+PROJECT_SITE_BASE = $(MAKEFILE_LIST:%/Makefile.mk=%)
PROJECT_SITE_CSS = project-site.css
PROJECT_SITE_DIRS = \
bin \
@@ -62,12 +62,21 @@ SITE_FILES = $(SITE_HTML) $(SITE_CSS)
# Make Targets
#
+default:
+ @echo 'There is no default target. You probably want one of these:'
+ @echo ''
+ @echo ' new - Create a new project'
+ @echo ' update - Update existing project'
+ @echo ''
+
# debug:
# echo $(MAKEFILE)
# @echo '>>' $(SITE_DIRS)
# @echo '>>>' $(SITE_FILES)
-website: $(SITE_DIRS) $(SITE_FILES)
+new: $(PROJECT_SITE_FILES)
+
+update: $(SITE_DIRS) $(SITE_FILES)
$(SITE_CSS): $(TEMPLATE)/$(PROJECT_SITE_CSS) Makefile config.yaml
tt-render --path=$(TEMPLATE) --data=config.yaml $(PROJECT_SITE_CSS) > $@
@@ -90,8 +99,6 @@ template/%.html: content/%.pod
$(SITE_DIRS) $(PROJECT_SITE_DIRS):
mkdir -p $@
-new: $(PROJECT_SITE_FILES)
-
# XXX Not working yet :\
# upgrade:
# make -f $(MAKEFILE) new
@@ -103,7 +110,7 @@ $(SITE)/index.html:
cp -p $(PROJECT_SITE_BASE)/gitignore $@
Makefile:
- ln -s $(PROJECT_SITE_BASE)/project-site.mk $@
+ ln -s $(PROJECT_SITE_BASE)/Makefile.mk $@
htdocs:
ln -s $(SITE) $@
View
1 README
View
1 SETUP
View
6 SETUP.rst
@@ -8,12 +8,12 @@ Project Site is easy to set up. Just follow these easy steps::
> git clone git://github.com/ingydotnet/project-site.git
> mkdir your-project-name
> cd your-project-name
- > make -f ../project-site/project-site.mk new
+ > make -f ../project-site/Makefile.mk new
... edit the config.yaml file appropriately
... add the appropriate image files to site/images/
... edit files in the content directory (See below)
- > make website
- ... repeat edit & 'make website' as necessary
+ > make update
+ ... repeat edit & 'make update' as necessary
The directory ``your/server/website/path/your-project-name/site/`` is your
website's root directory. You'll need to configure your web server to point at

0 comments on commit 4451f05

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