Filter away CVS and .svn files when building .tar.gz dist files; create GNUSTEP_OBJ_DIR before putting the rpm file-list in it when building RPMs

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23481 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-09-13 04:17:52 +00:00
parent aec6bd0d0e
commit 55bdf21640
3 changed files with 12 additions and 4 deletions

View file

@ -1,3 +1,12 @@
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
* Master/rpm.make (before-install) If filelist=yes, depend on
GNUSTEP_OBJ_DIR.
* Master/source-distribution.make (dist): Always use our
tar-exclude-list to avoid including CVS and .svn files in .tar.gz
packages.
2006-09-13 Nicola Pero <nicola.pero@meta-innovation.com>
* Master/rpm.make: Put the generated files (file-list, spec files)

View file

@ -197,7 +197,7 @@ ifeq ($(filelist),yes)
# ifeq ($(MAKELEVEL),0)
# Remove the old file list before installing, and initialize the new one.
before-install::
before-install:: $(GNUSTEP_OBJ_DIR)
$(ECHO_NOTHING)rm -f $(GNUSTEP_FILE_LIST)$(END_ECHO)
$(ECHO_NOTHING)echo "%attr (-, root, root)" >> $(GNUSTEP_FILE_LIST)$(END_ECHO)

View file

@ -66,6 +66,7 @@
# If you want to omit some files from the distribution archive, add a
# .dist-ignore file in the top-level directory of your package, listing
# all files (/directories) you want to exclude from distribution.
# CVS and .svn files are automatically excluded.
#
ifeq ($(CVS_MODULE_NAME),)
@ -157,7 +158,7 @@ dist: distclean
mv ../$(VERSION_NAME) ../$(VERSION_NAME)~; \
fi; \
mkdir ../$(VERSION_NAME); \
tar cf - . | (cd ../$(VERSION_NAME); tar xf -); \
tar cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list . | (cd ../$(VERSION_NAME); tar xf -); \
fi; \
cd ..; \
if [ -f $(ARCHIVE_FILE) ]; then \
@ -309,5 +310,3 @@ ifneq ($(RELEASE_DIR),)
fi; \
mv $(ARCHIVE_FILE) $(RELEASE_DIR)$(END_ECHO)
endif