X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=6594c478b98dc4566dc8e07fbb5bc4e34991ac1f;hb=87d984d47202cacb0ba3f6c1c1dc7d5769ade146;hp=f3fe0e38ffcfb76199462848ebba526e2116d7de;hpb=3062d573a7617339324c23cdd4755f8f04956b92;p=cocanwiki.git

diff --git a/Makefile b/Makefile
index f3fe0e3..6594c47 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.10 2004/10/07 12:49:15 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,14 +38,20 @@ 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
 
+FIXED_TABLES := templates themes
+
 cocanwiki.sql:
-	pg_dump -i -s cocanwiki > $@
+	pg_dump --no-owner -i -s cocanwiki > $@
+	for table in $(FIXED_TABLES); do \
+	  pg_dump --no-owner -i -a -t $$table cocanwiki >> $@; \
+	done
 
 dist:
 	$(MAKE) check-manifest
@@ -82,7 +89,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