X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=cb82e4d1fc42bb47dcf0fd1cb6de9aae905e528e;hb=f7c51650828ecfd52d3b2995e6980505ed5ad688;hp=644a474ad5ef49eb0f1f22e89065222c3991c826;hpb=6855525e48fad5de270500a5445c4f4ff85d8bda;p=diogenes.git diff --git a/Makefile b/Makefile index 644a474..cb82e4d 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,18 @@ # definitions -VERSION = 0.9.18 +VERSION = 0.9.20pre1 PKG_DIST = diogenes-$(VERSION) LIB_DIST = libdiogenes-$(VERSION) PKG_FILES = AUTHORS ChangeLog COPYING README Makefile \ cvs.pl style.css -PKG_DIRS = config htdocs include locale po plugins templates +PKG_DIRS = config htdocs include locale po plugins styles templates LIB_FILES = COPYING LIB_BASE = include/diogenes -VCS_FILTER = ! -name .arch-ids ! -name CVS +VCS_FILTER = \( -name .arch-ids -o -name CVS -o -name .svn \) -prune # global targets @@ -40,7 +40,7 @@ pkg-dist: pkg-build rm -rf $(PKG_DIST) $(PKG_DIST).tar.gz mkdir $(PKG_DIST) cp -a $(PKG_FILES) $(PKG_DIST) - for dir in `find $(PKG_DIRS) -type d $(VCS_FILTER)`; \ + for dir in `find $(PKG_DIRS) $(VCS_FILTER) -o -type d -print`; \ do \ mkdir -p $(PKG_DIST)/$$dir; \ find $$dir -maxdepth 1 -type f -exec cp {} $(PKG_DIST)/$$dir \; ; \ @@ -57,7 +57,7 @@ lib-dist: lib-build rm -rf $(LIB_DIST) mkdir $(LIB_DIST) cp -a $(LIB_FILES) $(LIB_DIST) - for dir in `cd $(LIB_BASE) && find -type d $(VCS_FILTER)`; \ + for dir in `cd $(LIB_BASE) && find . $(VCS_FILTER) -o -type d -print`; \ do \ mkdir -p $(LIB_DIST)/$$dir; \ find $(LIB_BASE)/$$dir -maxdepth 1 -type f -exec cp {} $(LIB_DIST)/$$dir \; ; \