Wed Jun 22 23:20:35 PDT 2005
- Previous message: [Slony1-commit] By devrim: Fix missing unclosed <sect2> tag.
- Next message: [Slony1-commit] By devrim: Add docbook-style-dsssl to BuildRequires list
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Don't depend on a GNU tar wthen calling the dist target, instead use the more portable find -prune method to emulate --exclude
Modified Files:
--------------
slony1-engine:
GNUmakefile.in (r1.23 -> r1.24)
-------------- next part --------------
Index: GNUmakefile.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/GNUmakefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -LGNUmakefile.in -LGNUmakefile.in -u -w -r1.23 -r1.24
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -9,7 +9,6 @@
top_builddir = .
include $(top_builddir)/Makefile.global
-TAR = tar
GZIP = gzip --best
DEFAULTBUILDS=src tools
@@ -70,25 +69,29 @@
rm -rf configure autom4te.cache
dist: distdir
- -chmod -R a+r $(distdir)
- $(TAR) --exclude */CVS -chof - @PACKAGE_NAME at -@PACKAGE_VERSION@ | $(GZIP) -c > @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz
- -rm -rf $(distdir)
-distdir: $(DISTFILES)
- -rm -rf $(distdir)
- mkdir $(distdir)
- mkdir $(distdir)/config
- mkdir $(distdir)/src
- mkdir $(distdir)/doc
- mkdir $(distdir)/share
- mkdir $(distdir)/makefiles
- -chmod -R 777 $(distdir)
- for file in $(DISTFILES) ; do \
- cp -r $$file $(distdir)/$$file ; \
- done
- for subdir in src doc tools ; do \
- $(MAKE) -C $$subdir distdir ; \
+distdir := @PACKAGE_NAME at -@PACKAGE_VERSION@
+dummy := =install=
+garbage := =* "#"* ."#"* *~* *.orig *.rej core @PACKAGE_NAME at -*
+
+dist := $(distdir).tar.gz
+
+distdir:
+ -rm -rf $(distdir)* $(dummy)
+ for x in `cd $(top_builddir) && find . -name CVS -prune -o -print`; do \
+ file=`expr X$$x : 'X\./\(.*\)'`; \
+ if test -d "$(top_builddir)/$$file" ; then \
+ mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file"; \
+ else \
+ ln "$(top_builddir)/$$file" "$(distdir)/$$file" >/dev/null 2>&1 \
+ || cp "$(top_builddir)/$$file" "$(distdir)/$$file"; \
+ fi || exit; \
done
+dist: distdir
+ $(TAR) cf @PACKAGE_NAME at -@PACKAGE_VERSION at .tar $(distdir)
+ $(GZIP) @PACKAGE_NAME at -@PACKAGE_VERSION at .tar
+ -rm -rf $(distdir)
+
rpm: dist
rpmbuild -ta @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz
- Previous message: [Slony1-commit] By devrim: Fix missing unclosed <sect2> tag.
- Next message: [Slony1-commit] By devrim: Add docbook-style-dsssl to BuildRequires list
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list