* adjust-parens: Two new defcustoms:

[gnu-emacs-elpa] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 1067e4c6f0d43c8ec481ea952a9f2a50c7c2fab2..2b077678f37ae6a0d1b6aa5e0e6fe409272943b5 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -13,8 +13,8 @@ CR_EXCEPTIONS=copyright_exceptions
 .PHONY: check_copyrights
 check_copyrights:
        @echo "Compute exceptions >$(CR_EXCEPTIONS)~"
-       @(cd packages;                                                  \
-       export LANG=C;                                                  \
+       @export LANG=C;                                                 \
+       (cd packages;                                                   \
        find . -name '*.el' -print0 |                                   \
            xargs -0 grep -L 'Free Software Foundation, Inc' |          \
            grep -v '\(\.dir-locals\|.-\(pkg\|autoloads\)\)\.el$$';     \
@@ -42,15 +42,21 @@ process-archive:
        # FIXME, we could probably speed this up significantly with
        # rules like "%.tar: ../%/ChangeLog" so we only rebuild the packages
        # that have indeed changed.
-       cd $(ARCHIVE_TMP)/packages; \
-         $(EMACS) -l $(CURDIR)/admin/archive-contents.el \
-           -f batch-make-archive
-       @cd $(ARCHIVE_TMP)/packages; \
-         for pt in *; do \
-             if [ -d $$pt ]; then \
-                 echo "Creating tarball $${pt}.tar" && \
-                 tar -cf $${pt}.tar $$pt --remove-files; \
-             fi; \
+       cd $(ARCHIVE_TMP)/packages;                             \
+         $(EMACS) -l $(CURDIR)/admin/archive-contents.el       \
+                  -f batch-make-archive
+       @cd $(ARCHIVE_TMP)/packages;                            \
+         for pt in *; do                                       \
+             if [ -f "$${pt}/.elpaignore" ]; then              \
+                 ignore="$${pt}/.elpaignore";                  \
+             else                                              \
+                 ignore="/dev/null";                           \
+             fi;                                               \
+             if [ -d $$pt ]; then                              \
+                 echo "Creating tarball $${pt}.tar" &&         \
+                 tar -cf $${pt}.tar $$pt -X "$$ignore";        \
+                 rm -r $${pt};                                 \
+             fi;                                               \
          done
        mkdir -p archive/packages
        mv archive/packages archive/packages-old
@@ -106,7 +112,7 @@ $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps, $(al))))
          $(EMACS) -l $(CURDIR)/admin/archive-contents.el \
              --eval "(archive--refresh-pkg-file)" \
              --eval "(require 'package)" \
-             --eval "(package-generate-autoloads '$$(basename $$(pwd)) \
+             --eval "(package-generate-autoloads \"$$(basename $$(pwd))\" \
                                                  \"$$(pwd)\")"
 
 # Put into elcs the set of elc files we need to keep up-to-date.