Commit 834aa383 authored by unknown's avatar unknown

SrcDist.sh, Epilogue.mk:

  improved distdir


ndb/Epilogue.mk:
  improved distdir
ndb/SrcDist.sh:
  improved distdir
parent be96b613
...@@ -852,16 +852,14 @@ ebrowse: DUMMY ...@@ -852,16 +852,14 @@ ebrowse: DUMMY
cd $(NDB_TOP); ebrowse --file tmpfile~ cd $(NDB_TOP); ebrowse --file tmpfile~
cd $(NDB_TOP); rm -f tmpfile~ cd $(NDB_TOP); rm -f tmpfile~
DISTFILES = $(shell /bin/sh SrcDist.sh)
srcdir = $(NDB_TOP) srcdir = $(NDB_TOP)
top_distdir = $(NDB_TOP)/.. top_distdir = $(NDB_TOP)/..
mkinstalldirs := /bin/sh ../mkinstalldirs mkinstalldirs := /bin/sh ../mkinstalldirs
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)/ndb distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)/ndb
distdir: $(DISTFILES) distdir:
$(mkinstalldirs) $(distdir) $(mkinstalldirs) $(distdir)
@list='$(DISTFILES)'; for file in $$list; do \ @list='$(shell /bin/sh SrcDist.sh)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
...@@ -870,9 +868,7 @@ distdir: $(DISTFILES) ...@@ -870,9 +868,7 @@ distdir: $(DISTFILES)
else \ else \
dir=''; \ dir=''; \
fi; \ fi; \
if test -d $$d/$$file; then \ if test -f $$d/$$file; then \
echo $(distdir)$$dir; \
else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \ || exit 1; \
......
# #
# Invoked from scripts/make_binary_distribution as "sh BinDist.sh". # Invoked from make distdir.
# Prints list of dirs and files to include under mysql/ndb. # Prints list of dirs and files to include under mysql/ndb.
# #
...@@ -29,35 +29,35 @@ __END__ ...@@ -29,35 +29,35 @@ __END__
# docs # docs
#find docs/*.html docs/*.pdf -print | sort -t/ #find docs/*.html docs/*.pdf -print
# include # include
find include -print | grep -v /SCCS | sort -t/ find include -print | grep -v /SCCS
# config # config
find config -print | grep -v /SCCS | sort -t/ find config -print | grep -v /SCCS
# tools # tools
find tools -print | grep -v /SCCS | grep -v '\.o' | grep -v tools/ndbsql | sort -t/ find tools -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v tools/ndbsql
# home # home
find home -print | grep -v /SCCS | sort -t/ find home -print | grep -v /SCCS
# test # test
find test -print | grep -v /SCCS | grep -v '\.o' | grep -v test/odbc | sort -t/ find test -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v test/odbc
# src # src
find src -print | grep -v /SCCS | grep -v '\.o' | grep -v src/client/odbc | grep -v cpcc-win32 | sort -t/ find src -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend' | grep -v src/client/odbc | grep -v cpcc-win32
# demos # demos
find demos -print | grep -v /SCCS | grep -v '\.o' | sort -t/ find demos -print | grep -v /SCCS | grep -v '\.o' | grep -v '\.depend'
# examples # examples
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment