projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'platal-0.9.16'
[platal.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e0480fa
..
eed1687
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-37,16
+37,12
@@
q:
## core
##
## core
##
-core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf
+core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf
spool/tmp
-spool/templates_c spool/mails_c spool/uploads spool/conf spool/
uploads/te
mp:
+spool/templates_c spool/mails_c spool/uploads spool/conf spool/
t
mp:
mkdir -p $@
chmod o+w $@
mkdir -p $@
chmod o+w $@
-spool/uploads/temp/.htaccess: spool/uploads/temp Makefile
- echo "Order deny,allow" > $@
- echo "Deny from all" >> $@
-
htdocs/.htaccess: htdocs/.htaccess.in Makefile
@REWRITE_BASE="/~$$(id -un)"; \
test "$$REWRITE_BASE" = "/~web" && REWRITE_BASE="/"; \
htdocs/.htaccess: htdocs/.htaccess.in Makefile
@REWRITE_BASE="/~$$(id -un)"; \
test "$$REWRITE_BASE" = "/~web" && REWRITE_BASE="/"; \
@@
-68,7
+64,7
@@
wiki: get-wiki build-wiki
build-wiki: $(WIKI_NEEDS) | get-wiki
build-wiki: $(WIKI_NEEDS) | get-wiki
-htdocs/uploads:
spool/uploads/temp/.htaccess
+htdocs/uploads:
cd htdocs && ln -sf ../spool/uploads
htdocs/wiki:
cd htdocs && ln -sf ../spool/uploads
htdocs/wiki:
@@
-105,13
+101,13
@@
get-wiki:
banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
htdocs/images/banana:
banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
htdocs/images/banana:
- cd $(@D) && ln -sf $(BANANA)/img $(@F)
+ cd $(@D) && ln -s
n
f $(BANANA)/img $(@F)
htdocs/css/banana.css:
htdocs/css/banana.css:
- cd $(@D) && ln -sf $(BANANA)/css/style.css $(@F)
+ cd $(@D) && ln -s
n
f $(BANANA)/css/style.css $(@F)
include/banana/banana.inc.php:
include/banana/banana.inc.php:
- cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -sf {} . ";"
+ cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -s
n
f {} . ";"
@@
-125,5
+121,5
@@
htdocs/javascript/jquery.js:
################################################################################
################################################################################
-.PHONY: build dist clean wiki build-wiki banana
+.PHONY: build dist clean wiki build-wiki banana
htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php