X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=d063bad0ea97ab7eeb66d10ac0a0feb1fed703e6;hb=867889b6d04b6381c74974e338672ee02d61920e;hp=f3fe0e38ffcfb76199462848ebba526e2116d7de;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/Makefile b/Makefile
index f3fe0e3..d063bad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 2004/09/07 10:14:07 rich Exp $
+# $Id: Makefile,v 1.7 2004/09/20 15:34:36 rich Exp $
 
 include Makefile.config
 
@@ -26,6 +26,7 @@ pkg-install:
 	install -d -m 0755 $(DESTDIR)$(WIKIINSTALLDIR)/html/_js
 	install -d -m 0755 $(DESTDIR)$(WIKIINSTALLDIR)/html/_static
 	install -d -m 0755 $(DESTDIR)$(WIKIINSTALLDIR)/templates
+	install -d -m 0755 $(DESTDIR)$(WIKIINSTALLDIR)/templates/admin
 
 	install -m 0644 cocanwiki.sql $(DESTDIR)$(WIKIINSTALLDIR)
 	install -m 0644 conf/cocanwiki.conf $(DESTDIR)$(WIKIINSTALLDIR)/conf
@@ -37,10 +38,11 @@ pkg-install:
 	install -m 0644 html/_graphics/*.png $(DESTDIR)$(WIKIINSTALLDIR)/html/_graphics
 	install -m 0644 html/_js/*.js $(DESTDIR)$(WIKIINSTALLDIR)/html/_js
 	install -m 0644 html/_static/*.html $(DESTDIR)$(WIKIINSTALLDIR)/html/_static
-	install -m 0644 templates/*.html $(DESTDIR)$(WIKIINSTALLDIR)/templates
+	install -m 0644 templates/*.html templates/*.txt templates/*.xml $(DESTDIR)$(WIKIINSTALLDIR)/templates
+	install -m 0644 templates/admin/*.html $(DESTDIR)$(WIKIINSTALLDIR)/templates/admin
 
 clean:
-	rm -f *~ core
+	find \( -name '*~' -o -name core \) -a -exec rm {} \;
 	$(MAKE) -C scripts clean
 
 cocanwiki.sql:
@@ -82,7 +84,7 @@ dpkg:
 	  cd /tmp/dbuild && \
 	  cvs export \
 	  -d cocanwiki-$(VERSION) \
-	  -D now merjis/test/wiki
+	  -D now merjis/tools/wiki
 	cd /tmp/dbuild/cocanwiki-$(VERSION) && dpkg-buildpackage -rfakeroot
 	rm -rf /tmp/dbuild/cocanwiki-$(VERSION)
 	ls -l /tmp/dbuild