refinements to try to modularize things a bit further

diff --git a/cvstools/Release-targets.mk b/cvstools/Release-targets.mk
index 9964b261c5f3a77862398f8a86c1948dadf508ec..2f642969e49af33615587901000e5c2940e5b7a2 100644 (file)
--- a/cvstools/Release-targets.mk
+++ b/cvstools/Release-targets.mk
@@ -44,7 +44,7 @@ else
        grep -v "<?xml" $(TMP)/fm-docbook-$(DISTRO) | freshmeat-submit $(FMGO)
 endif
 
-zip: excludes
+zip:
 ifeq ($(ZIPVER),)
        @echo You must specify ZIPVER for the zip target
        exit 1
@@ -55,10 +55,17 @@ ifneq ($(EXECUTABLES),)
        chmod 0755 $(EXECUTABLES)
 endif
        rm -rf $(TMP)/docbook-$(DISTRO)-$(ZIPVER)
+       rm -f  $(TMP)/tar.exclude
        rm -f  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.gz
        rm -f  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.bz2
        rm -f  $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip
-       umask 022; mkdir $(TMP)/docbook-$(DISTRO)-$(ZIPVER)
+       umask 022; mkdir -p $(TMP)/docbook-$(DISTRO)-$(ZIPVER)
+       touch $(TMP)/tar.exclude
+# distro-specific excludes
+       for file in $(DISTRIB_EXCLUDES); do \
+         find . -print  | grep $$file     | cut -c3- >> $(TMP)/tar.exclude; \
+       done
+# global excludes
        find . -print  | grep /CVS$$       | cut -c3- >> $(TMP)/tar.exclude
        find . -print  | grep /CVS/        | cut -c3- >> $(TMP)/tar.exclude
        find . -print  | grep /debian/     | cut -c3- >> $(TMP)/tar.exclude

diff --git a/cvstools/Release-vars.mk b/cvstools/Release-vars.mk
index 8a7953ae1586af1e2c249fa4d5b060286fdae41c..0874ea5db60fea362beb7cf1d57a12170c547d2f 100644 (file)
--- a/cvstools/Release-vars.mk
+++ b/cvstools/Release-vars.mk
@@ -8,7 +8,7 @@
 #-----------------------------------------------------------------
 
 # stylesheet for generating release notes
-DOC-LINK-STYLE=   $(DOCBOOK_CVS)/xsl/docsrc/doc-link-docbook.xsl
+DOC-LINK-STYLE=$(DOCBOOK_CVS)/xsl/docsrc/doc-link-docbook.xsl
 
 # browser to use for making text version of release notes
 BROWSER=w3m
@@ -22,12 +22,12 @@ BROWSER_OPTS=-dump
 #     whether or not it is a stylesheet
 #
 RELVER := $(shell \
- if [ -f $(DISTRO)/VERSION ]; then \
-   if grep "<xsl:stylesheet" $(DISTRO)/VERSION >/dev/null; then \
-     grep "Version>.\+<" $(DISTRO)/VERSION \
+ if [ -f VERSION ]; then \
+   if grep "<xsl:stylesheet" VERSION >/dev/null; then \
+     grep "Version>.\+<" VERSION \
      | sed 's/^[^<]*<fm:Version>\(.\+\)<\/fm:Version>$$/\1/' \
      | tr -d "\n"; \
-   else cat $(DISTRO)/VERSION; \
+   else cat VERSION; \
    fi \
  fi \
 )
@@ -52,17 +52,17 @@ endif
 # remove dots from version number to create CVS tag
 TAGVER := $(shell echo "V$(RELVER)" | sed "s/\.//g")
 
-# stuff for "make zip", "make freshmeat", and "make install" targets
+# to use a temp directory other than /tmp, run "make zip TMP=/foo"
+# or "make zip TMP=$TMP to override following setting
 TMP=/tmp
 # specifies options to feed to "freshmeat-submit"
 FMGO=-N
-# SFRELID specifies the Sourceforge release ID for the current
-# release. Before running "make freshmeat", you need to manually
-# create the new release at Sourceforge (via the SF web
-# interface), then copy down the release ID in the URI for the
-# release
+# SFRELID specifies Sourceforge release ID for current release.
+# Before running "make freshmeat", you need to manually create the
+# new release at Sourceforge (via the SF web interface), then copy
+# down the release ID in the URI for the release
 SFRELID=
-# specifies with FTP app to use for upload to SF incoming
+# specifies which FTP app to use for upload to SF incoming
 FTP=lftp
 FTP_OPTS=-e
 SCP=scp